[PATCH 4.10 43/62] ipv6: check raw payload size correctly in ioctl

From	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Newsgroups	linux.kernel
Subject	[PATCH 4.10 43/62] ipv6: check raw payload size correctly in ioctl
Date	2017-05-01 23:40 +0200
Message-ID	<tCrd0-5UI-33@gated-at.bofh.it> (permalink)
References	<tCrcZ-5UI-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

4.10-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Jamie Bainbridge <jbainbri@redhat.com>


[ Upstream commit 105f5528b9bbaa08b526d3405a5bcd2ff0c953c8 ]

In situations where an skb is paged, the transport header pointer and
tail pointer can be the same because the skb contents are in frags.

This results in ioctl(SIOCINQ/FIONREAD) incorrectly returning a
length of 0 when the length to receive is actually greater than zero.

skb->len is already correctly set in ip6_input_finish() with
pskb_pull(), so use skb->len as it always returns the correct result
for both linear and paged data.

Signed-off-by: Jamie Bainbridge <jbainbri@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/ipv6/raw.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -1174,8 +1174,7 @@ static int rawv6_ioctl(struct sock *sk,
 		spin_lock_bh(&sk->sk_receive_queue.lock);
 		skb = skb_peek(&sk->sk_receive_queue);
 		if (skb)
-			amount = skb_tail_pointer(skb) -
-				skb_transport_header(skb);
+			amount = skb->len;
 		spin_unlock_bh(&sk->sk_receive_queue.lock);
 		return put_user(amount, (int __user *)arg);
 	}

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

Thread

[PATCH 4.10 43/62] ipv6: check raw payload size correctly in ioctl Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-01 23:40 +0200

csiph-web