| Message ID | 20160418084449.GA12410@mwanda |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, 2016-04-18 at 11:44 +0300, Dan Carpenter wrote: > 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> Acked-by: Eric Dumazet <edumazet@google.com>
On Mon, Apr 18, 2016 at 8:19 AM, Eric Dumazet <eric.dumazet@gmail.com> wrote: > On Mon, 2016-04-18 at 11:44 +0300, Dan Carpenter wrote: >> 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> > > Acked-by: Eric Dumazet <edumazet@google.com> Acked-by: Willem de Bruijn <willemb@google.com> Thanks for catching this.
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Mon, 18 Apr 2016 11:44:49 +0300 > 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> Applied.
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); }
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>