diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-24 02:26:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-24 02:26:35 +0000 |
| commit | 359545a6aeec28a25a0ba59f71320489bedfeaa9 (patch) | |
| tree | 1d8c3da5bf4d7e9d7e208ba2232ab2bf3308c6b4 | |
| parent | f39768d940ffdbd9ba7a795af279efa8371cb08c (diff) | |
| parent | a49f6aaa53dabc26c26773557f403229f09e17fe (diff) | |
| download | platform_external_iproute2-359545a6aeec28a25a0ba59f71320489bedfeaa9.tar.gz platform_external_iproute2-359545a6aeec28a25a0ba59f71320489bedfeaa9.tar.bz2 platform_external_iproute2-359545a6aeec28a25a0ba59f71320489bedfeaa9.zip | |
Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel" am: 68454405a4 am: cd4884e9d6 am: a49f6aaa53android-mainline-11.0.0_r1android11-mainline-releaseandroid11-dev
Change-Id: Ifde7908cd3e411a3ba7d46ab24a8c75adbceecfe
| l--------- | include/linux/xfrm.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/xfrm.h | 12 | ||||
| -rw-r--r-- | ip/xfrm.h | 13 |
3 files changed, 24 insertions, 2 deletions
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h new file mode 120000 index 00000000..f43ae1b4 --- /dev/null +++ b/include/linux/xfrm.h @@ -0,0 +1 @@ +../uapi/linux/xfrm.h
\ No newline at end of file diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h index 93fb1920..8312d3d1 100644 --- a/include/uapi/linux/xfrm.h +++ b/include/uapi/linux/xfrm.h @@ -381,7 +381,11 @@ struct xfrm_usersa_info { #define XFRM_STATE_AF_UNSPEC 32 #define XFRM_STATE_ALIGN4 64 #define XFRM_STATE_ESN 128 -}; +} +#ifdef __i386__ +__attribute__((aligned(8))) /* b/138147164 */ +#endif +; #define XFRM_SA_XFLAG_DONT_ENCAP_DSCP 1 @@ -420,7 +424,11 @@ struct xfrm_userpolicy_info { /* Automatically expand selector to include matching ICMP payloads. */ #define XFRM_POLICY_ICMP 2 __u8 share; -}; +} +#ifdef __i386__ +__attribute__((aligned(8))) /* b/138147164 */ +#endif +; struct xfrm_userpolicy_id { struct xfrm_selector sel; @@ -30,6 +30,19 @@ #include <linux/xfrm.h> #include <linux/ipsec.h> +#ifdef __i386__ +/* b/138147164 */ +/* Adapted from checks in system/netd/server/XfrmController.h */ +_Static_assert(sizeof(struct xfrm_usersa_info) - offsetof(struct xfrm_usersa_info, flags) == 8, + "struct xfrm_usersa_info probably misaligned with kernel struct."); +_Static_assert(sizeof(struct xfrm_usersa_info) % 8 == 0, + "struct xfrm_usersa_info is not 64-bit aligned."); +_Static_assert(sizeof(struct xfrm_userpolicy_info) - offsetof(struct xfrm_userpolicy_info, share) == 5, + "struct xfrm_userpolicy_info probably misaligned with kernel struct."); +_Static_assert(sizeof(struct xfrm_userpolicy_info) % 8 == 0, + "struct xfrm_userpolicy_info is not 64-bit aligned."); +#endif /* __i386__ */ + #ifndef IPPROTO_MH #define IPPROTO_MH 135 #endif |