This is a note to let you know that I've just added the patch titled
net: flow_dissector: fix thoff for IPPROTO_AH
to the 3.11-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:
net-flow_dissector-fix-thoff-for-ipproto_ah.patch
and it can be found in the queue-3.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 23af5c08bf4b42ca3fd0255dd6191d7037a01439 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@xxxxxxxxxx>
Date: Thu, 26 Sep 2013 08:44:06 -0700
Subject: net: flow_dissector: fix thoff for IPPROTO_AH
From: Eric Dumazet <edumazet@xxxxxxxxxx>
[ Upstream commit b86783587b3d1d552326d955acee37eac48800f1 ]
In commit 8ed781668dd49 ("flow_keys: include thoff into flow_keys for
later usage"), we missed that existing code was using nhoff as a
temporary variable that could not always contain transport header
offset.
This is not a problem for TCP/UDP because port offset (@poff)
is 0 for these protocols.
Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
Cc: Daniel Borkmann <dborkman@xxxxxxxxxx>
Cc: Nikolay Aleksandrov <nikolay@xxxxxxxxxx>
Acked-by: Nikolay Aleksandrov <nikolay@xxxxxxxxxx>
Acked-by: Daniel Borkmann <dborkman@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/core/flow_dissector.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -150,8 +150,8 @@ ipv6:
if (poff >= 0) {
__be32 *ports, _ports;
- nhoff += poff;
- ports = skb_header_pointer(skb, nhoff, sizeof(_ports), &_ports);
+ ports = skb_header_pointer(skb, nhoff + poff,
+ sizeof(_ports), &_ports);
if (ports)
flow->ports = *ports;
}
Patches currently in stable-queue which might be from edumazet@xxxxxxxxxx are
queue-3.11/net_sched-htb-fix-a-typo-in-htb_change_class.patch
queue-3.11/ipv6-gre-correct-calculation-of-max_headroom.patch
queue-3.11/net-fix-multiqueue-selection.patch
queue-3.11/ip_tunnel-do-not-use-stale-inner_iph-pointer.patch
queue-3.11/bridge-use-br_port_get_rtnl-within-rtnl-lock.patch
queue-3.11/bridge-fix-null-pointer-deref-of-br_port_get_rcu.patch
queue-3.11/net-flow_dissector-fix-thoff-for-ipproto_ah.patch
queue-3.11/net-net_secret-should-not-depend-on-tcp.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html