Commit 110361f4 authored Apr 18, 2016 by Dan Carpenter Committed by David S. Miller Apr 18, 2016

udp: fix if statement in SIOCINQ ioctl



We deleted a line of code and accidentally made the "return put_user()"
part of the if statement when it's supposed to be unconditional.

Fixes: 9f9a45be ('udp: do not expect udp headers on ioctl SIOCINQ')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 550bce59

net/ipv4/udp.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -1276,12 +1276,6 @@ int udp_ioctl(struct sock *sk, int cmd, unsigned long arg)
		{
		unsigned int amount = first_packet_length(sk);

		if (amount)
		/*
		* We will only return the amount
		* of this packet since that is all
		* that will be read.
		*/
		return put_user(amount, (int __user *)arg);
		}

Admin message