Skip to content

Commit

Permalink
udp: fix if statement in SIOCINQ ioctl
Browse files Browse the repository at this point in the history
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: 9f9a45b ('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>
  • Loading branch information
Dan Carpenter authored and David S. Miller committed Apr 18, 2016
1 parent 550bce5 commit 110361f
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions net/ipv4/udp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 110361f

Please sign in to comment.