Patch "ipvs: handle ip_vs_fill_iph_skb_off failure" has been added to the 4.4-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
ipvs: handle ip_vs_fill_iph_skb_off failure
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ipvs-handle-ip_vs_fill_iph_skb_off-failure.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
3f20efba41916ee17ce82f0fdd02581ada2872b2Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Wed, 27 Jan 2016 14:52:02 +0100
Subject: ipvs: handle ip_vs_fill_iph_skb_off failure
From: Arnd Bergmann <[email protected]>
commit 3f20efba41916ee17ce82f0fdd02581ada2872b2 upstream.
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.
--- net/netfilter/ipvs/ip_vs_pe_sip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/ipvs/ip_vs_pe_sip.c +2 -2
@@ -70,10 +70,10 @@ ip_vs_sip_fill_param(struct ip_vs_conn_pconst 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
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/lpfc-fix-misleading-indentation.patch queue-4.4/ipvs-handle-ip_vs_fill_iph_skb_off-failure.patch