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

Commit dff630dd authored by Simon Horman's avatar Simon Horman
Browse files

ipvs: supply a valid 0 address to ip_vs_conn_new() 



ip_vs_conn_new expects a union nf_inet_addr as the type for its address
parameters, not a plain integer.

This problem was detected by sparse.

make C=1
  CHECK   net/ipv4/ipvs/ip_vs_core.c
net/ipv4/ipvs/ip_vs_core.c:469:9: warning: Using plain integer as NULL pointer

Acked-by: default avatarSven Wegener <sven.wegener@stealer.net>
Acked-by: default avatarJulius Volz <juliusv@google.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 9e691ed6

net/ipv4/ipvs/ip_vs_core.c

+2 −1
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, 
	if (sysctl_ip_vs_cache_bypass && svc->fwmark && unicast) {

		int ret, cs;

		struct ip_vs_conn *cp;

		union nf_inet_addr daddr =  { .all = { 0, 0, 0, 0 } };



		ip_vs_service_put(svc);
@@ -465,7 +466,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, 
		cp = ip_vs_conn_new(svc->af, iph.protocol,

				    &iph.saddr, pptr[0],

				    &iph.daddr, pptr[1],

				    0, 0,

				    &daddr, 0,

				    IP_VS_CONN_F_BYPASS,

				    NULL);

		if (cp == NULL)