forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Revert "xfrm: fix "disable_policy" on ipv4 early demux"

Browse source 
This reverts commit 497653f6d2 which is
commit 3a5913183a upstream.  It is not
needed here as the commit it fixes, e6175a2ed1 ("xfrm: fix
"disable_policy" flag use when arriving from different devices"), was
already reverted from this branch due to ABI issues.

Bug: 161946584
Change-Id: I9bcc08425bf73b6fd1dcad8d801ffc728e1021b6
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2022-12-06 19:05:25 +00:00
commit f3226d86f8
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
net/ipv4/ip_input.c
View file

@ -361,11 +361,6 @@ static int ip_rcv_finish_core(struct net *net, struct sock *sk,
iph->tos, dev); iph->tos, dev);
if (unlikely(err)) if (unlikely(err))
goto drop_error; goto drop_error;
} else {
struct in_device *in_dev = __in_dev_get_rcu(dev);
if (in_dev && IN_DEV_ORCONF(in_dev, NOPOLICY))
IPCB(skb)->flags |= IPSKB_NOPOLICY;
} }
#ifdef CONFIG_IP_ROUTE_CLASSID #ifdef CONFIG_IP_ROUTE_CLASSID