| From foo@baz Sun Nov 22 12:00:04 PM CET 2020 |
| From: Zhang Changzhong <zhangchangzhong@huawei.com> |
| Date: Tue, 17 Nov 2020 10:45:05 +0800 |
| Subject: ah6: fix error return code in ah6_input() |
| |
| From: Zhang Changzhong <zhangchangzhong@huawei.com> |
| |
| [ 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 | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/net/ipv6/ah6.c |
| +++ b/net/ipv6/ah6.c |
| @@ -600,7 +600,8 @@ static int ah6_input(struct xfrm_state * |
| 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; |
