FreeBSD regtest: cleanup fd handling

Build error on arm64 and update scalar expected.
scalar not looking right for x86

diff --git a/coregrind/m_syswrap/syswrap-arm64-freebsd.c b/coregrind/m_syswrap/syswrap-arm64-freebsd.c
index fe3107f50024bd9f5a6d124a6dfa183e0ab0e9b0..6054c641e20e3222a8ba26439453e387e68b060e 100644 (file)
--- a/coregrind/m_syswrap/syswrap-arm64-freebsd.c
+++ b/coregrind/m_syswrap/syswrap-arm64-freebsd.c
@@ -204,7 +204,6 @@ PRE(sys_preadv)
                  iovcnt, vki_off_t, offset);
    if (!ML_(fd_allowed)(ARG1, "preadv", tid, False))
       SET_STATUS_Failure(VKI_EBADF);
-   }
    if ((Int)ARG3 > 0) {
       PRE_MEM_READ("preadv(iov)", ARG2, ARG3 * sizeof(struct vki_iovec));
    }

diff --git a/memcheck/tests/freebsd/scalar.stderr.exp b/memcheck/tests/freebsd/scalar.stderr.exp
index 85f2db45af8eb33f2a267b9984e947ade48bf475..882433a92d3c5e5ccffb8172dacb4084bced10fd 100644 (file)
--- a/memcheck/tests/freebsd/scalar.stderr.exp
+++ b/memcheck/tests/freebsd/scalar.stderr.exp
@@ -2065,6 +2065,10 @@ Syscall param preadv(iovcnt) contains uninitialised byte(s)
 Syscall param preadv(offset) contains uninitialised byte(s)
    ...
 
+Syscall param preadv(iov) points to unaddressable byte(s)
+   ...
+ Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 ---------------------------------------------------------
 290:             SYS_pwritev 4s 0m
 ---------------------------------------------------------
@@ -2080,6 +2084,10 @@ Syscall param pwritev(iovcnt) contains uninitialised byte(s)
 Syscall param pwritev(offset) contains uninitialised byte(s)
    ...
 
+Syscall param pwritev(vector) points to unaddressable byte(s)
+   ...
+ Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
 ---------------------------------------------------------
 298:              SYS_fhopen 2s 1m
 ---------------------------------------------------------