Commit 42b73059 authored Aug 14, 2017 by Al Viro Committed by David S. Miller Aug 14, 2017

udp: fix linear skb reception with PEEK_OFF



copy_linear_skb() is broken; both of its callers actually
expect 'len' to be the amount we are trying to copy,
not the offset of the end.
Fix it keeping the meanings of arguments in sync with what the
callers (both of them) expect.
Also restore a saner behavior on EFAULT (i.e. preserving
the iov_iter position in case of failure):

The commit fd851ba9 ("udp: harden copy_linear_skb()")
avoids the more destructive effect of the buggy
copy_linear_skb(), e.g. no more invalid memory access, but
said function still behaves incorrectly: when peeking with
offset it can fail with EINVAL instead of copying the
appropriate amount of memory.

Reported-by: Sasha Levin <alexander.levin@verizon.com>
Fixes: b65ac446 ("udp: try to avoid 2 cache miss on dequeue")
Fixes: fd851ba9 ("udp: harden copy_linear_skb()")
Signed-off-by: Al Viro <viro@ZenIV.linux.org.uk>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Tested-by: Sasha Levin <alexander.levin@verizon.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e5645f51

include/net/udp.h

+4 −5

Original line number	Diff line number	Diff line
		@@ -366,14 +366,13 @@ static inline bool udp_skb_is_linear(struct sk_buff *skb)
		static inline int copy_linear_skb(struct sk_buff *skb, int len, int off,
		struct iov_iter *to)
		{
		int n, copy = len - off;
		int n;

		if (copy < 0)
		return -EINVAL;
		n = copy_to_iter(skb->data + off, copy, to);
		if (n == copy)
		n = copy_to_iter(skb->data + off, len, to);
		if (n == len)
		return 0;

		iov_iter_revert(to, n);
		return -EFAULT;
		}

Admin message