From c1710ded877f9a4a38b998b226e110d97e4f9c43 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 12 Aug 2022 15:55:37 +0200 Subject: [PATCH] ANDROID: xfrm: fix up CONFIG_ANDROID dependencies In commit 1045a06724f3 ("remove CONFIG_ANDROID"), CONFIG_ANDROID was removed, yet the xfrm networking code was doing some functionally different things if this option was, or was not, enabled. Restore the functionality by having the xfrm code check CONFIG_GKI_HACKS_TO_FIX instead. Fixes: 1045a06724f3 ("remove CONFIG_ANDROID") Signed-off-by: Greg Kroah-Hartman Change-Id: Ib153d5ef8a6935f56e634bcac5afef5070ec9f51 --- net/xfrm/xfrm_algo.c | 2 +- net/xfrm/xfrm_state.c | 2 +- net/xfrm/xfrm_user.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index 2f3449ce59bb..02913caa9a88 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c @@ -237,7 +237,7 @@ static struct xfrm_algo_desc aalg_list[] = { .uinfo = { .auth = { - .icv_truncbits = IS_ENABLED(CONFIG_ANDROID) ? 128 : 96, + .icv_truncbits = IS_ENABLED(CONFIG_GKI_HACKS_TO_FIX) ? 128 : 96, .icv_fullbits = 256, } }, diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index a12ee7590755..c9f5e209c084 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -2442,7 +2442,7 @@ int xfrm_user_policy(struct sock *sk, int optname, sockptr_t optval, int optlen) return PTR_ERR(data); /* Use the 64-bit / untranslated format on Android, even for compat */ - if (!IS_ENABLED(CONFIG_ANDROID) || IS_ENABLED(CONFIG_XFRM_USER_COMPAT)) { + if (!IS_ENABLED(CONFIG_GKI_HACKS_TO_FIX) || IS_ENABLED(CONFIG_XFRM_USER_COMPAT)) { if (in_compat_syscall()) { struct xfrm_translator *xtr = xfrm_get_translator(); diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 9d3767d61f5c..66e593c86434 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -2878,7 +2878,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, return -EPERM; /* Use the 64-bit / untranslated format on Android, even for compat */ - if (!IS_ENABLED(CONFIG_ANDROID) || IS_ENABLED(CONFIG_XFRM_USER_COMPAT)) { + if (!IS_ENABLED(CONFIG_GKI_HACKS_TO_FIX) || IS_ENABLED(CONFIG_XFRM_USER_COMPAT)) { if (in_compat_syscall()) { struct xfrm_translator *xtr = xfrm_get_translator();