This is a note to let you know that I've just added the patch titled
ipv6: fix illegal mac_header comparison on 32bit
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-illegal-mac_header-comparison-on-32bit.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.
>From foo@baz Mon Jan 13 09:39:01 PST 2014
From: Hannes Frederic Sowa <[email protected]>
Date: Fri, 13 Dec 2013 15:12:27 +0100
Subject: ipv6: fix illegal mac_header comparison on 32bit
From: Hannes Frederic Sowa <[email protected]>
Signed-off-by: Hannes Frederic Sowa <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
include/linux/skbuff.h | 5 +++++
net/ipv6/udp_offload.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1741,6 +1741,11 @@ static inline void skb_set_mac_header(st
}
#endif /* NET_SKBUFF_DATA_USES_OFFSET */
+static inline void skb_pop_mac_header(struct sk_buff *skb)
+{
+ skb->mac_header = skb->network_header;
+}
+
static inline void skb_probe_transport_header(struct sk_buff *skb,
const int offset_hint)
{
--- a/net/ipv6/udp_offload.c
+++ b/net/ipv6/udp_offload.c
@@ -85,7 +85,7 @@ static struct sk_buff *udp6_ufo_fragment
/* Check if there is enough headroom to insert fragment header. */
tnl_hlen = skb_tnl_header_len(skb);
- if (skb->mac_header < (tnl_hlen + frag_hdr_sz)) {
+ if (skb_mac_header(skb) < skb->head + tnl_hlen + frag_hdr_sz) {
if (gso_pskb_expand_head(skb, tnl_hlen + frag_hdr_sz))
goto out;
}
Patches currently in stable-queue which might be from
[email protected] are
queue-3.10/ipv6-don-t-count-addrconf-generated-routes-against-gc-limit.patch
queue-3.10/ipv6-always-set-the-new-created-dst-s-from-in-ip6_rt_copy.patch
queue-3.10/net-rose-restore-old-recvmsg-behavior.patch
queue-3.10/ipv6-fix-illegal-mac_header-comparison-on-32bit.patch
queue-3.10/ipv6-fixed-support-for-blackhole-and-prohibit-routes.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
