Commit 3f20efba authored Jan 27, 2016 by Arnd Bergmann Committed by Simon Horman Mar 07, 2016

ipvs: handle ip_vs_fill_iph_skb_off failure



ip_vs_fill_iph_skb_off() may not find an IP header, and gcc has
determined that ip_vs_sip_fill_param() then incorrectly accesses
the protocol fields:

net/netfilter/ipvs/ip_vs_pe_sip.c: In function 'ip_vs_sip_fill_param':
net/netfilter/ipvs/ip_vs_pe_sip.c:76:5: error: 'iph.protocol' may be used uninitialized in this function [-Werror=maybe-uninitialized]
  if (iph.protocol != IPPROTO_UDP)
     ^
net/netfilter/ipvs/ip_vs_pe_sip.c:81:10: error: 'iph.len' may be used uninitialized in this function [-Werror=maybe-uninitialized]
  dataoff = iph.len + sizeof(struct udphdr);
          ^

This adds a check for the ip_vs_fill_iph_skb_off() return code
before looking at the ip header data returned from it.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: b0e010c5 ("ipvs: replace ip_vs_fill_ip4hdr with ip_vs_fill_iph_skb_off")
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

parent 017b1b6d

net/netfilter/ipvs/ip_vs_pe_sip.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -70,10 +70,10 @@ ip_vs_sip_fill_param(struct ip_vs_conn_param p, struct sk_buff skb)
		const char *dptr;
		int retc;

		ip_vs_fill_iph_skb(p->af, skb, false, &iph);
		retc = ip_vs_fill_iph_skb(p->af, skb, false, &iph);

		/* Only useful with UDP */
		if (iph.protocol != IPPROTO_UDP)
		if (!retc \|\| iph.protocol != IPPROTO_UDP)
		return -EINVAL;
		/* todo: IPv6 fragments:
		* I think this only should be done for the first fragment. /HS