projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 5032628c GKH |
1 | From a6a5993243550b09f620941dea741b7421fdf79c Mon Sep 17 00:00:00 2001 |
| 2 | From: Ding Tianhong <dingtianhong@huawei.com> | |
| 3 | Date: Sat, 29 Apr 2017 10:38:48 +0800 | |
| 4 | Subject: iov_iter: don't revert iov buffer if csum error | |
| 5 | ||
| 6 | From: Ding Tianhong <dingtianhong@huawei.com> | |
| 7 | ||
| 8 | commit a6a5993243550b09f620941dea741b7421fdf79c upstream. | |
| 9 | ||
| 10 | The patch 327868212381 (make skb_copy_datagram_msg() et.al. preserve | |
| 11 | ->msg_iter on error) will revert the iov buffer if copy to iter | |
| 12 | failed, but it didn't copy any datagram if the skb_checksum_complete | |
| 13 | error, so no need to revert any data at this place. | |
| 14 | ||
| 15 | v2: Sabrina notice that return -EFAULT when checksum error is not correct | |
| 16 | here, it would confuse the caller about the return value, so fix it. | |
| 17 | ||
| 18 | Fixes: 327868212381 ("make skb_copy_datagram_msg() et.al. preserve->msg_iter on error") | |
| 19 | Signed-off-by: Ding Tianhong <dingtianhong@huawei.com> | |
| 20 | Acked-by: Al Viro <viro@zeniv.linux.org.uk> | |
| 21 | Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> | |
| 22 | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> | |
| 23 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 24 | ||
| 25 | --- | |
| 26 | net/core/datagram.c | 13 +++++++------ | |
| 27 | 1 file changed, 7 insertions(+), 6 deletions(-) | |
| 28 | ||
| 29 | --- a/net/core/datagram.c | |
| 30 | +++ b/net/core/datagram.c | |
| 31 | @@ -760,7 +760,7 @@ int skb_copy_and_csum_datagram_msg(struc | |
| 32 | ||
| 33 | if (msg_data_left(msg) < chunk) { | |
| 34 | if (__skb_checksum_complete(skb)) | |
| 35 | - goto csum_error; | |
| 36 | + return -EINVAL; | |
| 37 | if (skb_copy_datagram_msg(skb, hlen, msg, chunk)) | |
| 38 | goto fault; | |
| 39 | } else { | |
| 40 | @@ -768,15 +768,16 @@ int skb_copy_and_csum_datagram_msg(struc | |
| 41 | if (skb_copy_and_csum_datagram(skb, hlen, &msg->msg_iter, | |
| 42 | chunk, &csum)) | |
| 43 | goto fault; | |
| 44 | - if (csum_fold(csum)) | |
| 45 | - goto csum_error; | |
| 46 | + | |
| 47 | + if (csum_fold(csum)) { | |
| 48 | + iov_iter_revert(&msg->msg_iter, chunk); | |
| 49 | + return -EINVAL; | |
| 50 | + } | |
| 51 | + | |
| 52 | if (unlikely(skb->ip_summed == CHECKSUM_COMPLETE)) | |
| 53 | netdev_rx_csum_fault(skb->dev); | |
| 54 | } | |
| 55 | return 0; | |
| 56 | -csum_error: | |
| 57 | - iov_iter_revert(&msg->msg_iter, chunk); | |
| 58 | - return -EINVAL; | |
| 59 | fault: | |
| 60 | return -EFAULT; | |
| 61 | } |