Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d6f77b1 authored by Zhang Changzhong's avatar Zhang Changzhong Committed by Greg Kroah-Hartman
Browse files

ah6: fix error return code in ah6_input() 



[ 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: 1da177e4 ("Linux-2.6.12-rc2")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Link: https://lore.kernel.org/r/1605581105-35295-1-git-send-email-zhangchangzhong@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce62d3c7

net/ipv6/ah6.c

+2 −1
Original line number Diff line number Diff line
@@ -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;