]> git.karo-electronics.de Git - karo-tx-linux.git/commit
netfilter: ipvs/SIP: handle ip_vs_fill_iph_skb_off failure
authorArnd Bergmann <arnd@arndb.de>
Wed, 27 Jan 2016 13:52:02 +0000 (14:52 +0100)
committerSimon Horman <horms@verge.net.au>
Wed, 27 Jan 2016 23:38:19 +0000 (08:38 +0900)
commit6709d1f4ece514e123277d689073feacf92a7c4b
treead984df448612fefebaff069da9cfc54edac2ceb
parent38565a2cbba0d2fa0569a33eff07ceda45a64ffd
netfilter: ipvs/SIP: 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: b0e010c527de ("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>
net/netfilter/ipvs/ip_vs_pe_sip.c