Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 fd851ba ("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 <[email protected]> Fixes: b65ac44 ("udp: try to avoid 2 cache miss on dequeue") Fixes: fd851ba ("udp: harden copy_linear_skb()") Signed-off-by: Al Viro <[email protected]> Acked-by: Paolo Abeni <[email protected]> Tested-by: Sasha Levin <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
- Loading branch information