Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9399bdcb authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 6fb8c381 74005991

net/xfrm/xfrm_user.c

+5 −0
Original line number Diff line number Diff line
@@ -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;