Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1319822

Re: [PATCH 2/2] netfilter: ipvs/SIP: handle ip_vs_fill_iph_skb_off failure

Show all headers | View raw

	Hello,

On Wed, 27 Jan 2016, Arnd Bergmann wrote:

> 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")

	Looks ok to me,

Acked-by: Julian Anastasov <ja@ssi.bg>

	but see below...

> ---
>  net/netfilter/ipvs/ip_vs_pe_sip.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/net/netfilter/ipvs/ip_vs_pe_sip.c b/net/netfilter/ipvs/ip_vs_pe_sip.c
> index 1b8d594e493a..c4e9ca016a88 100644
> --- a/net/netfilter/ipvs/ip_vs_pe_sip.c
> +++ b/net/netfilter/ipvs/ip_vs_pe_sip.c
> @@ -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

	There are other places like this where result is not
checked because there is always a guarding skb_header_pointer
check, i.e. ip_vs_fill_iph_skb* should not fail at such point.

	Let us know you want to extend this patch with other such
calls (including ip_vs_fill_iph_skb_icmp)? May be they will
need return NF_ACCEPT. I guess, all such changes should be
for the ipvs-next/net-next tree when it opens.

Regards

--
Julian Anastasov <ja@ssi.bg>

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] netfilter: ipvs: avoid unused variable warnings Arnd Bergmann <arnd@arndb.de> - 2016-01-27 15:00 +0100
  [PATCH 2/2] netfilter: ipvs/SIP: handle ip_vs_fill_iph_skb_off failure Arnd Bergmann <arnd@arndb.de> - 2016-01-27 15:00 +0100
    Re: [PATCH 2/2] netfilter: ipvs/SIP: handle ip_vs_fill_iph_skb_off  failure Julian Anastasov <ja@ssi.bg> - 2016-01-27 22:10 +0100
      Re: [PATCH 2/2] netfilter: ipvs/SIP: handle ip_vs_fill_iph_skb_off  failure Simon Horman <horms@verge.net.au> - 2016-01-28 00:40 +0100
  Re: [PATCH 1/2] netfilter: ipvs: avoid unused variable warnings Julian Anastasov <ja@ssi.bg> - 2016-01-27 21:20 +0100
    Re: [PATCH 1/2] netfilter: ipvs: avoid unused variable warnings Simon Horman <horms@verge.net.au> - 2016-01-28 00:50 +0100
      Re: [PATCH 1/2] netfilter: ipvs: avoid unused variable warnings Arnd Bergmann <arnd@arndb.de> - 2016-01-28 13:40 +0100

csiph-web