Skip to contentSkip to conversation

Patch "ipv6: fix exthdrs offload registration in out_rt path" has been added to the 3.10-stable tree

PATCH [email protected] 1 participant 1 message Sep 29, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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.10-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.10 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 foo@baz Tue Sep 29 14:20:47 CEST 2015

From: Daniel Borkmann <[email protected]>
Date: Thu, 3 Sep 2015 00:29:07 +0200
Subject: ipv6: fix exthdrs offload registration in out_rt path

From: Daniel Borkmann <[email protected]>

[ 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.")
---
 net/ipv6/exthdrs_offload.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/exthdrs_offload.c +1 -1
@@ -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 [email protected] are

queue-3.10/x86-bpf_jit-fix-compilation-of-large-bpf-programs.patch queue-3.10/ipv6-fix-exthdrs-offload-registration-in-out_rt-path.patch