projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update kernel 3.18 to version 3.18.29
[openwrt.git]
/
target
/
linux
/
generic
/
patches-3.18
/
082-ipv6-ip6_fragment-fix-headroom-tests-and-skb-leak.patch
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
7c833c4
..
d3da41e
100644
(file)
--- 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
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
-@@ -59
4,20 +594
,22 @@ int ip6_fragment(struct sk_buff *skb, in
+@@ -59
7,20 +597
,22 @@ int ip6_fragment(struct sk_buff *skb, in
}
mtu -= hlen + sizeof(struct frag_hdr);
}
mtu -= hlen + sizeof(struct frag_hdr);
@@
-69,7
+69,7
@@
Closes 20532
goto slow_path_clean;
/* Partially cloned skb? */
goto slow_path_clean;
/* Partially cloned skb? */
-@@ -62
4,8 +626
,6 @@ int ip6_fragment(struct sk_buff *skb, in
+@@ -62
7,8 +629
,6 @@ int ip6_fragment(struct sk_buff *skb, in
err = 0;
offset = 0;
err = 0;
offset = 0;
@@
-78,7
+78,7
@@
Closes 20532
/* BUILD HEADER */
*prevhdr = NEXTHDR_FRAGMENT;
/* BUILD HEADER */
*prevhdr = NEXTHDR_FRAGMENT;
-@@ -63
3,8 +633
,11 @@ int ip6_fragment(struct sk_buff *skb, in
+@@ -63
6,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);
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));
__skb_pull(skb, hlen);
fh = (struct frag_hdr *)__skb_push(skb, sizeof(struct frag_hdr));
-@@ -73
2,7 +735
,6 @@ slow_path:
+@@ -73
5,7 +738
,6 @@ slow_path:
*/
*prevhdr = NEXTHDR_FRAGMENT;
*/
*prevhdr = NEXTHDR_FRAGMENT;