diff options
author | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-27 15:13:36 +0200 |
---|---|---|
committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-27 15:13:36 +0200 |
commit | f14d3f5d46d9ef534cd51360f066260fb434548f (patch) | |
tree | 81ec5060ed9ba99e9bd1eeb2556737cfe0015158 /target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | |
parent | ce116bc6f997d8d6e6b976cacce5d4c60d705fc6 (diff) | |
download | master-187ad058-f14d3f5d46d9ef534cd51360f066260fb434548f.tar.gz master-187ad058-f14d3f5d46d9ef534cd51360f066260fb434548f.tar.bz2 master-187ad058-f14d3f5d46d9ef534cd51360f066260fb434548f.zip |
generic/3.18: bump kernel to 3.18.44
Patch 610- is updated as check_entry helper was killed in 3.18.37
Patch 666- is updated (thanks to Stijn Tintel)
Fixes CVE-2016-5195 (dirtycow)
Compile-tested on adm5120 and mcs814x
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch index 000665f047..e3e4000f93 100644 --- a/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch +++ b/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch @@ -297,13 +297,13 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> + for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) { + unsigned mshift = 32 - fmr->ip4_prefix_len; + if (ntohl(fmr->ip4_prefix.s_addr) >> mshift == -+ ntohl(iph->daddr) >> mshift) ++ ntohl(ip_hdr(skb)->daddr) >> mshift) + break; + } + + /* change dstaddr according to FMR */ + if (fmr) -+ ip4ip6_fmr_calc(&fl6.daddr, iph, skb_tail_pointer(skb), fmr, true); ++ ip4ip6_fmr_calc(&fl6.daddr, ip_hdr(skb), skb_tail_pointer(skb), fmr, true); + err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu); if (err != 0) { |