diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2016-01-02 01:11:55 +0000 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2016-01-22 21:40:09 +0000 |
commit | 414d4d9d3354c8e4aa58dc51cea5768f145e5275 (patch) | |
tree | 4dd30438885fc292e53da60d7081509eb1f4495e /include | |
parent | ef90cf3d0b59e3b1dcfe94d1a241107667e6e96a (diff) |
Revert "net: add length argument to skb_copy_and_csum_datagram_iovec"
This reverts commit 127500d724f8c43f452610c9080444eedb5eaa6c. That fixed
the problem of buffer over-reads introduced by backporting commit
89c22d8c3b27 ("net: Fix skb csum races when peeking"), but resulted in
incorrect checksumming for short reads. It will be replaced with a
complete fix.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/skbuff.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index d0c9e6da90f7..d9c4a603c25e 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2134,8 +2134,7 @@ extern int skb_copy_datagram_iovec(const struct sk_buff *from, int size); extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen, - struct iovec *iov, - int len); + struct iovec *iov); extern int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset, const struct iovec *from, |