From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:52500 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756370AbbI2Mbl (ORCPT ); Tue, 29 Sep 2015 08:31:41 -0400 Subject: Patch "ipv6: fix exthdrs offload registration in out_rt path" has been added to the 3.14-stable tree To: daniel@iogearbox.net, davem@davemloft.net, gregkh@linuxfoundation.org Cc: , From: Date: Tue, 29 Sep 2015 14:23:22 +0200 Message-ID: <144352940217193@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ipv6: fix exthdrs offload registration in out_rt path to the 3.14-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: ipv6-fix-exthdrs-offload-registration-in-out_rt-path.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Tue Sep 29 14:20:37 CEST 2015 From: Daniel Borkmann Date: Thu, 3 Sep 2015 00:29:07 +0200 Subject: ipv6: fix exthdrs offload registration in out_rt path From: Daniel Borkmann [ Upstream commit e41b0bedba0293b9e1e8d1e8ed553104b9693656 ] We previously register IPPROTO_ROUTING offload under inet6_add_offload(), but in error path, we try to unregister it with inet_del_offload(). This doesn't seem correct, it should actually be inet6_del_offload(), also ipv6_exthdrs_offload_exit() from that commit seems rather incorrect (it also uses rthdr_offload twice), but it got removed entirely later on. Fixes: 3336288a9fea ("ipv6: Switch to using new offload infrastructure.") Signed-off-by: Daniel Borkmann Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv6/exthdrs_offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/ipv6/exthdrs_offload.c +++ b/net/ipv6/exthdrs_offload.c @@ -36,6 +36,6 @@ out: return ret; out_rt: - inet_del_offload(&rthdr_offload, IPPROTO_ROUTING); + inet6_del_offload(&rthdr_offload, IPPROTO_ROUTING); goto out; } Patches currently in stable-queue which might be from daniel@iogearbox.net are queue-3.14/ipv6-fix-exthdrs-offload-registration-in-out_rt-path.patch queue-3.14/rtnetlink-verify-ifla_vf_info-attributes-before-passing-them-to-driver.patch queue-3.14/netlink-mmap-transform-mmap-skb-into-full-skb-on-taps.patch