mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user: Fix payload size logic in host_to_target_cmsg()

Browse Source 
Coverity points out that there's a missing break in the switch in
host_to_target_cmsg() where we update tgt_len for
cmsg_level/cmsg_type combinations which require a different length
for host and target (CID 1385425).  To avoid duplicating the default
case (target length same as host) in both switches, set that before
the switch so that only the cases which want to override it need any
code.

This fixes a bug where we would have used the wrong length
for SOL_SOCKET/SO_TIMESTAMP messages where the target and
host have differently sized 'struct timeval' (ie one is 32
bit and the other is 64 bit).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20180518184715.29833-1-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Peter Maydell 2018-05-18 19:47:15 +01:00 committed by Laurent Vivier
parent 2b5249b85c
commit 309786cfd8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
linux-user/syscall.c
View File

@ -1848,6 +1848,7 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh,
/* Payload types which need a different size of payload on /* Payload types which need a different size of payload on
* the target must adjust tgt_len here. * the target must adjust tgt_len here.
*/ */
tgt_len = len;
switch (cmsg->cmsg_level) { switch (cmsg->cmsg_level) {
case SOL_SOCKET: case SOL_SOCKET:
switch (cmsg->cmsg_type) { switch (cmsg->cmsg_type) {
@ -1857,8 +1858,8 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh,
default: default:
break; break;
} }
break;
default: default:
tgt_len = len;
break; break;
} }