summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Potapenko <glider@google.com>2017-03-08 18:08:16 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-20 10:04:53 +0100
commitaccbd99507b1b22a0402cfd7b385a87a541f404d (patch)
treedaca33c653c77181eeb51057da8d83057ea85380
parentb5213e1e9f25ccde958aa6364815ee87fef91100 (diff)
downloadlinux-stable-accbd99507b1b22a0402cfd7b385a87a541f404d.tar.gz
linux-stable-accbd99507b1b22a0402cfd7b385a87a541f404d.tar.bz2
linux-stable-accbd99507b1b22a0402cfd7b385a87a541f404d.zip
net: initialize msg.msg_flags in recvfrom
[ Upstream commit 9f138fa609c47403374a862a08a41394be53d461 ] KMSAN reports a use of uninitialized memory in put_cmsg() because msg.msg_flags in recvfrom haven't been initialized properly. The flag values don't affect the result on this path, but it's still a good idea to initialize them explicitly. Signed-off-by: Alexander Potapenko <glider@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/socket.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c
index fbfa9d2492cf..2cf4f25f5c2b 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1697,6 +1697,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
/* We assume all kernel code knows the size of sockaddr_storage */
msg.msg_namelen = 0;
msg.msg_iocb = NULL;
+ msg.msg_flags = 0;
if (sock->file->f_flags & O_NONBLOCK)
flags |= MSG_DONTWAIT;
err = sock_recvmsg(sock, &msg, iov_iter_count(&msg.msg_iter), flags);