From be1df039d6cc3369034b180b66178ae3825c942f Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Wed, 29 Aug 2018 11:19:41 -0700 Subject: Revert "xfrm: Do not parse 32bits compiled xfrm netlink msg on 64bits host" With the compatibility code in netd this change is no longer needed and will instead block the correctly aligned messages. This change is not portable anywhere but will serve to make the emulator kernel work together with the framework so we can support IPSec on x86_32 on a x86_64 kernel. This reverts commit 74005991b78a0a7a6546004fb37d33a651c613e7 Bug: 116799743 Change-Id: Ibce3ab6cbb3709eaa949501302c36b302d2e1d1e Signed-off-by: Roman Kiryanov --- net/xfrm/xfrm_user.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 967a6024a799..280369fc7e28 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -2598,11 +2598,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 (in_compat_syscall()) - return -EOPNOTSUPP; -#endif - type = nlh->nlmsg_type; if (type > XFRM_MSG_MAX) return -EINVAL; -- cgit v1.2.3