fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: fix crash nf_xfrm_me_harder

Browse Source
This commit is contained in:
Chen Minqiang 2019-07-11 22:34:41 +08:00 committed by AmadeusGhost
parent 639dd37fd7
commit ab6b020a65
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/linux/generic/hack-4.14/950-fix-crash-nf_xfrm_me_harder.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -98,6 +98,8 @@ int nf_xfrm_me_harder(struct net *net, s
return err;
dst = skb_dst(skb);
+ if (!dst)
+ return -EHOSTUNREACH;
if (dst->xfrm)
dst = ((struct xfrm_dst *)dst)->route;
if (!dst_hold_safe(dst))

11
target/linux/generic/hack-4.19/950-fix-crash-nf_xfrm_me_harder.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -118,6 +118,8 @@ int nf_xfrm_me_harder(struct net *net, s
return err;
dst = skb_dst(skb);
+ if (!dst)
+ return -EHOSTUNREACH;
if (dst->xfrm)
dst = ((struct xfrm_dst *)dst)->route;
if (!dst_hold_safe(dst))

2
target/linux/generic/pending-4.14/616-net_optimize_xfrm_calls.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct dst_entry *dst;
int err;
+ if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
+ if (!net->xfrm.policy_count[XFRM_POLICY_OUT])
+ return 0;
+
err = xfrm_decode_session(skb, &fl, family);

2
target/linux/generic/pending-4.19/616-net_optimize_xfrm_calls.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct sock *sk = skb->sk;
int err;
+ if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
+ if (!net->xfrm.policy_count[XFRM_POLICY_OUT])
+ return 0;
+
err = xfrm_decode_session(skb, &fl, family);