diff options
| author | Tri Vo <trong@google.com> | 2019-07-25 16:57:16 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2019-07-29 00:14:49 -0700 |
| commit | ea2db829e4acec8a228bfc8a8453af266f0cd0ff (patch) | |
| tree | ca5f2d8d4b7cdd64601decda81f936c5f3a3b281 | |
| parent | db3af59b11dac73fa67cdc4f3052ef51c6fd06e7 (diff) | |
ANDROID: xfrm: remove in_compat_syscall() checks
This hack is needed to run 32-bit userspace on 64-bit kernel.
Bug: 138147164
Test: kernel_net_tests
Signed-off-by: Tri Vo <trong@google.com>
Change-Id: I083d32b45ca985cfadfe3ce57d253b63202befde
| -rw-r--r-- | net/xfrm/xfrm_state.c | 5 | ||||
| -rw-r--r-- | net/xfrm/xfrm_user.c | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 13f261feb75c..6475d18149c0 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -1848,11 +1848,6 @@ int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen struct xfrm_mgr *km; struct xfrm_policy *pol = NULL; -#ifdef CONFIG_COMPAT - if (is_compat_task()) - return -EOPNOTSUPP; -#endif - if (!optval && !optlen) { xfrm_sk_policy_insert(sk, XFRM_POLICY_IN, NULL); xfrm_sk_policy_insert(sk, XFRM_POLICY_OUT, NULL); diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 4804f29fd011..13d86ef96e56 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -2524,11 +2524,6 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) const struct xfrm_link *link; int type, err; -#ifdef CONFIG_COMPAT - if (is_compat_task()) - return -EOPNOTSUPP; -#endif - type = nlh->nlmsg_type; if (type > XFRM_MSG_MAX) return -EINVAL; |