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.carpen...@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);
        }
 

Reply via email to