[patch -next] udp: fix if statement in SIOCINQ ioctl

From	Dan Carpenter <dan.carpenter@oracle.com>
Newsgroups	linux.kernel
Subject	[patch -next] udp: fix if statement in SIOCINQ ioctl
Date	2016-04-18 10:50 +0200
Message-ID	<rpd2x-2oe-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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: 9f9a45beaa96 ('udp: do not expect udp headers on ioctl SIOCINQ')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index f186313..37e09c3 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -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);
 	}

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[patch -next] udp: fix if statement in SIOCINQ ioctl Dan Carpenter <dan.carpenter@oracle.com> - 2016-04-18 10:50 +0200
  Re: [patch -next] udp: fix if statement in SIOCINQ ioctl Eric Dumazet <eric.dumazet@gmail.com> - 2016-04-18 14:30 +0200
    Re: [patch -next] udp: fix if statement in SIOCINQ ioctl Willem de Bruijn <willemdebruijn.kernel@gmail.com> - 2016-04-18 15:50 +0200
  Re: [patch -next] udp: fix if statement in SIOCINQ ioctl David Miller <davem@davemloft.net> - 2016-04-18 19:50 +0200

csiph-web