projects
/
wrapfs-3.14.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ce62d3c
)
ah6: fix error return code in ah6_input()
author
Zhang Changzhong
<zhangchangzhong@huawei.com>
Tue, 17 Nov 2020 02:45:05 +0000
(10:45 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 24 Nov 2020 12:02:52 +0000
(13:02 +0100)
[ Upstream commit
a5ebcbdf34b65fcc07f38eaf2d60563b42619a59
]
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Link:
https://lore.kernel.org/r/1605581105-35295-1-git-send-email-zhangchangzhong@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv6/ah6.c
patch
|
blob
|
history
diff --git
a/net/ipv6/ah6.c
b/net/ipv6/ah6.c
index 0edc44cb254e086c85690294d270305e5d2019b6..519e0730d9f62979ed12b3bc4546a0b9fde07835 100644
(file)
--- a/
net/ipv6/ah6.c
+++ b/
net/ipv6/ah6.c
@@
-595,7
+595,8
@@
static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
memcpy(auth_data, ah->auth_data, ahp->icv_trunc_len);
memset(ah->auth_data, 0, ahp->icv_trunc_len);
- if (ipv6_clear_mutable_options(ip6h, hdr_len, XFRM_POLICY_IN))
+ err = ipv6_clear_mutable_options(ip6h, hdr_len, XFRM_POLICY_IN);
+ if (err)
goto out_free;
ip6h->priority = 0;