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

Commit 582b8e3e authored by Hans Schillstrom's avatar Hans Schillstrom Committed by Pablo Neira Ayuso
Browse files

ipvs: take care of return value from protocol init_netns 



ip_vs_create_timeout_table() can return NULL
All functions protocol init_netns is affected of this patch.

Signed-off-by: default avatarHans Schillstrom <hans.schillstrom@ericsson.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 4b984cd5

include/net/ip_vs.h

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ struct ip_vs_protocol { 


	void (*exit)(struct ip_vs_protocol *pp);



	void (*init_netns)(struct net *net, struct ip_vs_proto_data *pd);

	int (*init_netns)(struct net *net, struct ip_vs_proto_data *pd);



	void (*exit_netns)(struct net *net, struct ip_vs_proto_data *pd);

net/netfilter/ipvs/ip_vs_proto.c

+9 −2
Original line number Diff line number Diff line
@@ -78,8 +78,15 @@ register_ip_vs_proto_netns(struct net *net, struct ip_vs_protocol *pp) 
	ipvs->proto_data_table[hash] = pd;

	atomic_set(&pd->appcnt, 0);	/* Init app counter */



	if (pp->init_netns != NULL)

		pp->init_netns(net, pd);

	if (pp->init_netns != NULL) {

		int ret = pp->init_netns(net, pd);

		if (ret) {

			/* unlink an free proto data */

			ipvs->proto_data_table[hash] = pd->next;

			kfree(pd);

			return ret;

		}

	}



	return 0;

}

net/netfilter/ipvs/ip_vs_proto_sctp.c

+4 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ out: 
 *   timeouts is netns related now.

 * ---------------------------------------------

 */

static void __ip_vs_sctp_init(struct net *net, struct ip_vs_proto_data *pd)

static int __ip_vs_sctp_init(struct net *net, struct ip_vs_proto_data *pd)

{

	struct netns_ipvs *ipvs = net_ipvs(net);
@@ -1098,6 +1098,9 @@ static void __ip_vs_sctp_init(struct net *net, struct ip_vs_proto_data *pd) 
	spin_lock_init(&ipvs->sctp_app_lock);

	pd->timeout_table = ip_vs_create_timeout_table((int *)sctp_timeouts,

							sizeof(sctp_timeouts));

	if (!pd->timeout_table)

		return -ENOMEM;

	return 0;

}



static void __ip_vs_sctp_exit(struct net *net, struct ip_vs_proto_data *pd)

net/netfilter/ipvs/ip_vs_proto_tcp.c

+4 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ void ip_vs_tcp_conn_listen(struct net *net, struct ip_vs_conn *cp) 
 *   timeouts is netns related now.

 * ---------------------------------------------

 */

static void __ip_vs_tcp_init(struct net *net, struct ip_vs_proto_data *pd)

static int __ip_vs_tcp_init(struct net *net, struct ip_vs_proto_data *pd)

{

	struct netns_ipvs *ipvs = net_ipvs(net);
@@ -685,7 +685,10 @@ static void __ip_vs_tcp_init(struct net *net, struct ip_vs_proto_data *pd) 
	spin_lock_init(&ipvs->tcp_app_lock);

	pd->timeout_table = ip_vs_create_timeout_table((int *)tcp_timeouts,

							sizeof(tcp_timeouts));

	if (!pd->timeout_table)

		return -ENOMEM;

	pd->tcp_state_table =  tcp_states;

	return 0;

}



static void __ip_vs_tcp_exit(struct net *net, struct ip_vs_proto_data *pd)

net/netfilter/ipvs/ip_vs_proto_udp.c

+4 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ udp_state_transition(struct ip_vs_conn *cp, int direction, 
	cp->timeout = pd->timeout_table[IP_VS_UDP_S_NORMAL];

}



static void __udp_init(struct net *net, struct ip_vs_proto_data *pd)

static int __udp_init(struct net *net, struct ip_vs_proto_data *pd)

{

	struct netns_ipvs *ipvs = net_ipvs(net);
@@ -475,6 +475,9 @@ static void __udp_init(struct net *net, struct ip_vs_proto_data *pd) 
	spin_lock_init(&ipvs->udp_app_lock);

	pd->timeout_table = ip_vs_create_timeout_table((int *)udp_timeouts,

							sizeof(udp_timeouts));

	if (!pd->timeout_table)

		return -ENOMEM;

	return 0;

}



static void __udp_exit(struct net *net, struct ip_vs_proto_data *pd)