diff options
| author | tadeusz.struk@intel.com <tadeusz.struk@intel.com> | 2015-12-15 10:46:17 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-22 20:55:49 -0800 |
| commit | 2eccd92cea9b6f4deaad7ed7b36178628ed8c0c3 (patch) | |
| tree | 665c67f5f3d24d8da5c9cfe77df5d3da98cb61ce | |
| parent | 9b11c6bd46ec36ddee89e29702584d0eaca2e4f7 (diff) | |
| download | lwn-2eccd92cea9b6f4deaad7ed7b36178628ed8c0c3.tar.gz lwn-2eccd92cea9b6f4deaad7ed7b36178628ed8c0c3.zip | |
net: fix uninitialized variable issue
[ Upstream commit 130ed5d105dde141e7fe60d5440aa53e0a84f13b ]
msg_iocb needs to be initialized on the recv/recvfrom path.
Otherwise afalg will wrongly interpret it as an async call.
Cc: stable@vger.kernel.org
Reported-by: Harald Freudenberger <freude@linux.vnet.ibm.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/socket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c index 9963a0b53a64..f3fbe17b5765 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1702,6 +1702,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size, msg.msg_name = addr ? (struct sockaddr *)&address : NULL; /* We assume all kernel code knows the size of sockaddr_storage */ msg.msg_namelen = 0; + msg.msg_iocb = NULL; if (sock->file->f_flags & O_NONBLOCK) flags |= MSG_DONTWAIT; err = sock_recvmsg(sock, &msg, iov_iter_count(&msg.msg_iter), flags); |