| From foo@baz Wed Dec 30 19:48:47 PST 2015 |
| From: "tadeusz.struk@intel.com" <tadeusz.struk@intel.com> |
| Date: Tue, 15 Dec 2015 10:46:17 -0800 |
| Subject: net: fix uninitialized variable issue |
| |
| From: "tadeusz.struk@intel.com" <tadeusz.struk@intel.com> |
| |
| [ 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> |
| --- |
| net/socket.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/net/socket.c |
| +++ b/net/socket.c |
| @@ -1702,6 +1702,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void |
| 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); |