diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-03-30 16:41:26 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-03-30 16:41:26 +0000 |
| commit | 0c025eddb72a09d5417978b0669a8bbfaf7271c3 (patch) | |
| tree | 334bf5f6d5fcd66291794e9a92a7940dfc21206f /target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch | |
| parent | eddc59770109d5fb12b2857679776705b9d5cb21 (diff) | |
| download | master-187ad058-0c025eddb72a09d5417978b0669a8bbfaf7271c3.tar.gz master-187ad058-0c025eddb72a09d5417978b0669a8bbfaf7271c3.tar.bz2 master-187ad058-0c025eddb72a09d5417978b0669a8bbfaf7271c3.zip | |
kernel: update kernel 3.18 to version 3.18.29
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49096 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch b/target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch index 7c833c4102..d3da41e918 100644 --- a/target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch +++ b/target/linux/generic/patches-3.18/082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch @@ -44,7 +44,7 @@ Closes 20532 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c -@@ -594,20 +594,22 @@ int ip6_fragment(struct sk_buff *skb, in +@@ -597,20 +597,22 @@ int ip6_fragment(struct sk_buff *skb, in } mtu -= hlen + sizeof(struct frag_hdr); @@ -69,7 +69,7 @@ Closes 20532 goto slow_path_clean; /* Partially cloned skb? */ -@@ -624,8 +626,6 @@ int ip6_fragment(struct sk_buff *skb, in +@@ -627,8 +629,6 @@ int ip6_fragment(struct sk_buff *skb, in err = 0; offset = 0; @@ -78,7 +78,7 @@ Closes 20532 /* BUILD HEADER */ *prevhdr = NEXTHDR_FRAGMENT; -@@ -633,8 +633,11 @@ int ip6_fragment(struct sk_buff *skb, in +@@ -636,8 +636,11 @@ int ip6_fragment(struct sk_buff *skb, in if (!tmp_hdr) { IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_FRAGFAILS); @@ -91,7 +91,7 @@ Closes 20532 __skb_pull(skb, hlen); fh = (struct frag_hdr *)__skb_push(skb, sizeof(struct frag_hdr)); -@@ -732,7 +735,6 @@ slow_path: +@@ -735,7 +738,6 @@ slow_path: */ *prevhdr = NEXTHDR_FRAGMENT; |