github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 05:27:07 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: Fix CRC issue up with xfrm headers in 5.10.94

Browse Source 
Two changes to net/xfrm/xfrm_policy.c in the 5.10.94 release ended up
changing the CRC for a xfrm function, despite no actual change
happening.  Fix this up by putting __GENKSYMS__ bounds on the include
files to preserve the CRC.

Bug: 161946584
Fixes: 7f2ca96bd2 ("xfrm: Don't accidentally set RTO_ONLINK in decode_session4()")
Fixes: 56f974d583 ("xfrm: fix policy lookup for ipv6 gre packets")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia09ea8d4439ec276716396f40dc82c0958624690
This commit is contained in:
Greg Kroah-Hartman 2022-01-31 15:14:24 +01:00
parent a50b069165
commit 34fd8cb7e7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/xfrm/xfrm_policy.c
View File

@ -31,10 +31,14 @@
#include <linux/if_tunnel.h> #include <linux/if_tunnel.h>
#include <net/dst.h> #include <net/dst.h>
#include <net/flow.h> #include <net/flow.h>
#ifndef __GENKSYMS__
#include <net/inet_ecn.h> #include <net/inet_ecn.h>
#endif
#include <net/xfrm.h> #include <net/xfrm.h>
#include <net/ip.h> #include <net/ip.h>
#ifndef __GENKSYMS__
#include <net/gre.h> #include <net/gre.h>
#endif
#if IS_ENABLED(CONFIG_IPV6_MIP6) #if IS_ENABLED(CONFIG_IPV6_MIP6)
#include <net/mip6.h> #include <net/mip6.h>
#endif #endif