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

!10993 ipvs: properly dereference pe in ip_vs_add_service 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/BTQIJAN7U6GZNSXKULBKHUCQOX5EHSSN/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAKQ7N 
 
Link:https://gitee.com/openeuler/kernel/pulls/10993

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 05db3a6e 12d7242b

net/netfilter/ipvs/ip_vs_ctl.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1384,18 +1384,18 @@ ip_vs_add_service(struct netns_ipvs *ipvs, struct ip_vs_service_user_kern *u, 
		sched = NULL;

		sched = NULL;

	}

	}





	/* Bind the ct retriever */

	RCU_INIT_POINTER(svc->pe, pe);

	pe = NULL;



	/* Update the virtual service counters */

	/* Update the virtual service counters */

	if (svc->port == FTPPORT)

	if (svc->port == FTPPORT)

		atomic_inc(&ipvs->ftpsvc_counter);

		atomic_inc(&ipvs->ftpsvc_counter);

	else if (svc->port == 0)

	else if (svc->port == 0)

		atomic_inc(&ipvs->nullsvc_counter);

		atomic_inc(&ipvs->nullsvc_counter);

	if (svc->pe && svc->pe->conn_out)

	if (pe && pe->conn_out)

		atomic_inc(&ipvs->conn_out_counter);

		atomic_inc(&ipvs->conn_out_counter);





	/* Bind the ct retriever */

	RCU_INIT_POINTER(svc->pe, pe);

	pe = NULL;



	ip_vs_start_estimator(ipvs, &svc->stats);

	ip_vs_start_estimator(ipvs, &svc->stats);





	/* Count only IPv4 services for old get/setsockopt interface */

	/* Count only IPv4 services for old get/setsockopt interface */