Merge pull request #82 from kevans91/cmsg

Further bsd-user cmsg fixes
CTSRD-CHERI · Dec 3, 2021 · 666cf07 · 666cf07
1 parent e1581ab
commit 666cf07
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/bsd-user/freebsd/os-socket.c b/bsd-user/freebsd/os-socket.c
@@ -46,8 +46,8 @@ abi_long t2h_freebsd_cmsg(struct msghdr *msgh,
         void *data = CMSG_DATA(cmsg);
         void *target_data = TARGET_CMSG_DATA(target_cmsg);
 
-        int len = tswap32(target_cmsg->cmsg_len)
-            - sizeof(struct target_cmsghdr);
+        int len = (unsigned char *)(target_cmsg) + tswap32(target_cmsg->cmsg_len) -
+		    (unsigned char *)target_data;
 
         space += CMSG_SPACE(len);
         if (space > msgh->msg_controllen) {
@@ -85,7 +85,7 @@ abi_long t2h_freebsd_cmsg(struct msghdr *msgh,
                &&  cmsg->cmsg_type == SCM_CREDS) {
             printf("XXX %s SCM_CREDS\n", __FUNCTION__);
         } else {
-            gemu_log("Unsupported ancillary data: %d/%d\n",
+            gemu_log("t2h Unsupported ancillary data: %d/%d\n",
                                         cmsg->cmsg_level, cmsg->cmsg_type);
             memcpy(data, target_data, len);
         }
@@ -123,7 +123,9 @@ abi_long h2t_freebsd_cmsg(struct target_msghdr *target_msgh,
         void *data = CMSG_DATA(cmsg);
         void *target_data = TARGET_CMSG_DATA(target_cmsg);
 
-        int len = cmsg->cmsg_len - sizeof(struct cmsghdr);
+        int len = (unsigned char *)(cmsg) + cmsg->cmsg_len -
+		    (unsigned char *)data;
+
         int tgt_len, tgt_space;
 
         /* We never copy a half-header but may copy half-data;
@@ -222,15 +224,15 @@ abi_long h2t_freebsd_cmsg(struct target_msghdr *target_msgh,
             break; // switch (cmsg->cmsg_type)
         default:
         unimplemented:
-            gemu_log("Unsupported ancillary data: %d/%d\n",
+            gemu_log("h2t Unsupported ancillary data: %d/%d\n",
                                         cmsg->cmsg_level, cmsg->cmsg_type);
             memcpy(target_data, data, MIN(len, tgt_len));
             if (tgt_len > len) {
                 memset(target_data + len, 0, tgt_len - len);
             }
         }
 
-       target_cmsg->cmsg_len = tswapal(TARGET_CMSG_LEN(tgt_len));
+        target_cmsg->cmsg_len = tswap32(TARGET_CMSG_LEN(tgt_len));
         tgt_space = TARGET_CMSG_SPACE(tgt_len);
         if (msg_controllen < tgt_space) {
             tgt_space = msg_controllen;

diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h
@@ -446,14 +446,14 @@ struct target_cmsghdr {
     int32_t     cmsg_type;
 };
 
-#define TARGET_CMSG_DATA(cmsg) ((unsigned char *)((struct target_cmsghdr *) (cmsg) + 1))
 #define TARGET_CMSG_NXTHDR(mhdr, cmsg, cmsg_start) \
                                __target_cmsg_nxthdr(mhdr, cmsg, cmsg_start)
 #define TARGET_CMSG_ALIGN(len) (((len) + sizeof(abi_long) - 1) \
                                & (size_t) ~(sizeof(abi_long) - 1))
-#define TARGET_CMSG_SPACE(len) (sizeof(struct target_cmsghdr) + \
+#define TARGET_CMSG_DATA(cmsg) ((unsigned char *)(cmsg) + TARGET_CMSG_ALIGN(sizeof(struct target_cmsghdr)))
+#define TARGET_CMSG_SPACE(len) (TARGET_CMSG_ALIGN(sizeof(struct target_cmsghdr)) + \
                                 TARGET_CMSG_ALIGN(len))
-#define TARGET_CMSG_LEN(len) (sizeof(struct target_cmsghdr) + (len))
+#define TARGET_CMSG_LEN(len) (TARGET_CMSG_ALIGN(sizeof(struct target_cmsghdr)) + (len))
 
 static inline struct target_cmsghdr *
 __target_cmsg_nxthdr(struct target_msghdr *__mhdr,