summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-04-09 14:41:47 -0400
committerDavid S. Miller <davem@davemloft.net>2015-04-09 14:41:47 -0400
commit9399bdcbb54b1e224a8532c01d496ada87e526bd (patch)
tree1fb76e1f36d16e2ce591d1146f20f8035405a23c
parent6fb8c381a6412981c05741d7d077c3f537eb5d14 (diff)
parent74005991b78a0a7a6546004fb37d33a651c613e7 (diff)
downloadop-kernel-dev-9399bdcbb54b1e224a8532c01d496ada87e526bd.zip
op-kernel-dev-9399bdcbb54b1e224a8532c01d496ada87e526bd.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says: ==================== pull request (net-next): ipsec-next 2015-04-09 1) Prohibit the use/abuse of the xfrm netlink interface on 32/64 bit compatibility tasks. We need a full compat layer before we can allow this. From Fan Du. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/xfrm/xfrm_user.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 7de2ed9..2091664 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -2423,6 +2423,11 @@ 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 -ENOTSUPP;
+#endif
+
type = nlh->nlmsg_type;
if (type > XFRM_MSG_MAX)
return -EINVAL;
OpenPOWER on IntegriCloud