summaryrefslogtreecommitdiffstats
path: root/net/ipv4/udp.c
diff options
context:
space:
mode:
authorWillem de Bruijn <willemb@google.com>2016-04-07 18:12:58 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-13 22:24:52 -0400
commit9f9a45beaa96188085d52d273c2ecb052c7d8d27 (patch)
treea1f2b887720607b10c94a7fcf79c3fd2a8045dfb /net/ipv4/udp.c
parent99717bdfdbeaaf387ba6ecbf7eba7fbb7a47e50a (diff)
downloadop-kernel-dev-9f9a45beaa96188085d52d273c2ecb052c7d8d27.zip
op-kernel-dev-9f9a45beaa96188085d52d273c2ecb052c7d8d27.tar.gz
udp: do not expect udp headers on ioctl SIOCINQ
On udp sockets, ioctl SIOCINQ returns the payload size of the first packet. Since commit e6afc8ace6dd pulled the headers, the result is incorrect when subtracting header length. Remove that operation. Fixes: e6afc8ace6dd ("udp: remove headers from UDP packets before queueing") Signed-off-by: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp.c')
-rw-r--r--net/ipv4/udp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 3563788d..d2d294b 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1282,8 +1282,6 @@ int udp_ioctl(struct sock *sk, int cmd, unsigned long arg)
* of this packet since that is all
* that will be read.
*/
- amount -= sizeof(struct udphdr);
-
return put_user(amount, (int __user *)arg);
}
OpenPOWER on IntegriCloud