Unverified Commit 74c396a0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11345 netfilter: ctnetlink: use helper function to calculate expect ID 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3LUPNJ777TD4PBRUUHVOGK7WLMPUF7AC/ 
 
https://gitee.com/src-openeuler/kernel/issues/IANOZB 
 
Link:https://gitee.com/openeuler/kernel/pulls/11345

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents e93a446d 51f8ea3f

net/netfilter/nf_conntrack_netlink.c

+2 −1
Original line number Diff line number Diff line
@@ -3142,7 +3142,8 @@ static int ctnetlink_del_expect(struct net *net, struct sock *ctnl, 


		if (cda[CTA_EXPECT_ID]) {

			__be32 id = nla_get_be32(cda[CTA_EXPECT_ID]);

			if (ntohl(id) != (u32)(unsigned long)exp) {



			if (id != nf_expect_get_id(exp)) {

				nf_ct_expect_put(exp);

				return -ENOENT;

			}