mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
generic: drop 616-net_optimize_xfrm_calls.patch
The conditional check introduced by this patch may trigger a NULL pointer dereference in case the result of dev_net() is NULL. Since the purpose of this patch is neither sufficiently explained and since this patch apparently has never been submitted upstream despite it being in the pending-* patch directory, I propose to drop it without replacement. If the performance implications of dropping this patch are found to be significiant, it should be reintroduced with proper description and benchmark results. Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2943 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
parent
8d9e26457c
commit
93294b516e
@ -1,20 +0,0 @@
|
||||
From: Felix Fietkau <nbd@nbd.name>
|
||||
Subject: kernel: add a small xfrm related performance optimization
|
||||
|
||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
---
|
||||
net/netfilter/nf_nat_core.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
--- a/net/netfilter/nf_nat_core.c
|
||||
+++ b/net/netfilter/nf_nat_core.c
|
||||
@@ -90,6 +90,9 @@ int nf_xfrm_me_harder(struct net *net, s
|
||||
struct dst_entry *dst;
|
||||
int err;
|
||||
|
||||
+ if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
|
||||
+ return 0;
|
||||
+
|
||||
err = xfrm_decode_session(skb, &fl, family);
|
||||
if (err < 0)
|
||||
return err;
|
@ -1,20 +0,0 @@
|
||||
From: Felix Fietkau <nbd@nbd.name>
|
||||
Subject: kernel: add a small xfrm related performance optimization
|
||||
|
||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
---
|
||||
net/netfilter/nf_nat_core.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
--- a/net/netfilter/nf_nat_core.c
|
||||
+++ b/net/netfilter/nf_nat_core.c
|
||||
@@ -110,6 +110,9 @@ int nf_xfrm_me_harder(struct net *net, s
|
||||
struct sock *sk = skb->sk;
|
||||
int err;
|
||||
|
||||
+ if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
|
||||
+ return 0;
|
||||
+
|
||||
err = xfrm_decode_session(skb, &fl, family);
|
||||
if (err < 0)
|
||||
return err;
|
@ -1,20 +0,0 @@
|
||||
From: Felix Fietkau <nbd@nbd.name>
|
||||
Subject: kernel: add a small xfrm related performance optimization
|
||||
|
||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
---
|
||||
net/netfilter/nf_nat_core.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
--- a/net/netfilter/nf_nat_core.c
|
||||
+++ b/net/netfilter/nf_nat_core.c
|
||||
@@ -155,6 +155,9 @@ int nf_xfrm_me_harder(struct net *net, s
|
||||
struct sock *sk = skb->sk;
|
||||
int err;
|
||||
|
||||
+ if (skb->dev && !dev_net(skb->dev)->xfrm.policy_count[XFRM_POLICY_OUT])
|
||||
+ return 0;
|
||||
+
|
||||
err = xfrm_decode_session(skb, &fl, family);
|
||||
if (err < 0)
|
||||
return err;
|
Loading…
Reference in New Issue
Block a user