Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 130ed5d1 authored by tadeusz.struk@intel.com's avatar tadeusz.struk@intel.com Committed by David S. Miller
Browse files

net: fix uninitialized variable issue 



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: default avatarHarald Freudenberger <freude@linux.vnet.ibm.com>
Signed-off-by: default avatarTadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5233252f

net/socket.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1695,6 +1695,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size, 
	msg.msg_name = addr ? (struct sockaddr *)&address : NULL;

	msg.msg_name = addr ? (struct sockaddr *)&address : NULL;

	/* We assume all kernel code knows the size of sockaddr_storage */

	/* We assume all kernel code knows the size of sockaddr_storage */

	msg.msg_namelen = 0;

	msg.msg_namelen = 0;

	msg.msg_iocb = NULL;

	if (sock->file->f_flags & O_NONBLOCK)

	if (sock->file->f_flags & O_NONBLOCK)

		flags |= MSG_DONTWAIT;

		flags |= MSG_DONTWAIT;

	err = sock_recvmsg(sock, &msg, iov_iter_count(&msg.msg_iter), flags);

	err = sock_recvmsg(sock, &msg, iov_iter_count(&msg.msg_iter), flags);