Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1fc1b05 authored by Jamie Bainbridge's avatar Jamie Bainbridge Committed by Greg Kroah-Hartman
Browse files

ipv6: check raw payload size correctly in ioctl 



[ 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: default avatarJamie Bainbridge <jbainbri@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1dc1b7b5

net/ipv6/raw.c

+1 −2
Original line number Diff line number Diff line
@@ -1171,8 +1171,7 @@ static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg) 
		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);

	}