Patchwork [V3,1/3] linux-user: pass sockaddr from host to target

login
register
mail settings
Submitter Jing Huang
Date July 21, 2012, 1:28 a.m.
Message ID <1342834137-2629-1-git-send-email-jing.huang.pku@gmail.com>
Download mbox | patch
Permalink /patch/172315/
State New
Headers show

Comments

Peter Maydell - July 20, 2012, 6:12 p.m.
On 21 July 2012 02:28, Jing Huang <jing.huang.pku@gmail.com> wrote:
>
> Signed-off-by: Jing Huang <jing.huang.pku@gmail.com>

When you send v4 of this series please can you include in this
patch the deletion of the comment line
"/* ??? Should this also swap msgh->name?  */"
from just above target_to_host_cmsg().
(This patch does the swapping of msgh->name in the caller
and so it has dealt with this ??? question.)

If you make just that change you can add
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

to the commit message for this patch.

-- PMM
Jing Huang - July 21, 2012, 1:28 a.m.
Signed-off-by: Jing Huang <jing.huang.pku@gmail.com>
---
 linux-user/syscall.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

Patch

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 539af3f..82aa83d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1873,10 +1873,21 @@  static abi_long do_sendrecvmsg(int fd, abi_ulong target_msg,
         if (!is_error(ret)) {
             len = ret;
             ret = host_to_target_cmsg(msgp, &msg);
-            if (!is_error(ret))
+            if (!is_error(ret)) {
+                msgp->msg_namelen = tswap32(msg.msg_namelen);
+                if (msg.msg_name != NULL) {
+                    ret = host_to_target_sockaddr(tswapal(msgp->msg_name),
+                                    msg.msg_name, msg.msg_namelen);
+                    if (ret) {
+                        goto out;
+                    }
+                }
+
                 ret = len;
+            }
         }
     }
+out:
     unlock_iovec(vec, target_vec, count, !send);
     unlock_user_struct(msgp, target_msg, send ? 0 : 1);
     return ret;