Skip to content

Commit f1270bf

Browse files
committed
fix regression: zero-init msghdr
- regressed in 9086834 - re-apply #8
1 parent e3acca9 commit f1270bf

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

patch/linux-user__syscall.c.diff

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
2-
index 376629c68..88507fc17 100644
2+
index ccd3892b2..eb1a9dc5e 100644
33
--- a/linux-user/syscall.c
44
+++ b/linux-user/syscall.c
55
@@ -134,6 +134,13 @@
@@ -16,6 +16,15 @@ index 376629c68..88507fc17 100644
1616
#ifndef CLONE_IO
1717
#define CLONE_IO 0x80000000 /* Clone io context */
1818
#endif
19+
@@ -3208,7 +3215,7 @@ static abi_long do_sendrecvmsg_locked(int fd, struct target_msghdr *msgp,
20+
int flags, int send)
21+
{
22+
abi_long ret, len;
23+
- struct msghdr msg;
24+
+ struct msghdr msg = { 0 };
25+
abi_ulong count;
26+
struct iovec *vec;
27+
abi_ulong target_vec;
1928
@@ -7273,9 +7280,20 @@ static inline abi_long host_to_target_timex64(abi_long target_addr,
2029
#define sigev_notify_thread_id _sigev_un._tid
2130
#endif

0 commit comments

Comments
 (0)