Commit 61e7113e authored by Steffen Klassert's avatar Steffen Klassert
Browse files

Merge 'xfrm: Add compat layer' 

Dmitry Safonov says:

====================
Changes since v2:
- added struct xfrm_translator as API to register xfrm_compat.ko with
  xfrm_state.ko. This allows compilation of translator as a loadable
  module
- fixed indention and collected reviewed-by (Johannes Berg)
- moved boilerplate from commit messages into cover-letter (Steffen
  Klassert)
- found on KASAN build and fixed non-initialised stack variable usage
  in the translator

The resulting v2/v3 diff can be found here:
https://gist.github.com/0x7f454c46/8f68311dfa1f240959fdbe7c77ed2259

Patches as a .git branch:
https://github.com/0x7f454c46/linux/tree/xfrm-compat-v3

Changes since v1:
- reworked patches set to use translator
- separated the compat layer into xfrm_compat.c,
  compiled under XFRM_USER_COMPAT config
- 32-bit messages now being sent in frag_list (like wext-core does)
- instead of __packed add compat_u64 members in compat structures
- selftest reworked to kselftest lib API
- added netlink dump testing to the selftest

XFRM is disabled for compatible users because of the UABI difference.
The difference is in structures paddings and in the result the size
of netlink messages differ.

Possibility for compatible application to manage xfrm tunnels was
disabled by: the commmit 19d7df69 ("xfrm: Refuse to insert 32 bit
userspace socket policies on 64 bit systems") and the commit 74005991
("xfrm: Do not parse 32bits compiled xfrm netlink msg on 64bits host").

This is my second attempt to resolve the xfrm/compat problem by adding
the 64=>32 and 32=>64 bit translators those non-visibly to a user
provide translation between compatible user and kernel.
Previous attempt was to interrupt the message ABI according to a syscall
by xfrm_user, which resulted in over-complicated code [1].

Florian Westphal provided the idea of translator and some draft patches
in the discussion. In these patches, his idea is reused and some of his
initial code is also present.

There were a couple of attempts to solve xfrm compat problem:
https://lkml.org/lkml/2017/1/20/733
https://patchwork.ozlabs.org/patch/44600/
http://netdev.vger.kernel.narkive.com/2Gesykj6/patch-net-next-xfrm-correctly-parse-netlink-msg-from-32bits-ip-command-on-64bits-host

All the discussions end in the conclusion that xfrm should have a full
compatible layer to correctly work with 32-bit applications on 64-bit
kernels:
https://lkml.org/lkml/2017/1/23/413
https://patchwork.ozlabs.org/patch/433279/

In some recent lkml discussion, Linus said that it's worth to fix this
problem and not giving people an excuse to stay on 32-bit kernel:
https://lkml.org/lkml/2018/2/13/752

There is also an selftest for ipsec tunnels.
It doesn't depend on any library and compat version can be easy
build with: make CFLAGS=-m32 net/ipsec

[1]: https://lkml.kernel.org/r/20180726023144.31066-1-dima@arista.com


====================

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parents 02a20d4f bc2652b7

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12145,6 +12145,7 @@ F: net/ipv6/ipcomp6.c 
F:	net/ipv6/xfrm*

F:	net/key/

F:	net/xfrm/

F:	tools/testing/selftests/net/ipsec.c









NETWORKING [IPv4/IPv6]









M:	"David S. Miller" <davem@davemloft.net>
































include/net/xfrm.h



+33
−0






























Original line number
Diff line number
Diff line







@@ -2000,6 +2000,39 @@ static inline int xfrm_tunnel_check(struct sk_buff *skb, struct xfrm_state *x,







	return 0;









}



















extern const int xfrm_msg_min[XFRM_NR_MSGTYPES];









extern const struct nla_policy xfrma_policy[XFRMA_MAX+1];



















struct xfrm_translator {









	/* Allocate frag_list and put compat translation there */









	int (*alloc_compat)(struct sk_buff *skb, const struct nlmsghdr *src);



















	/* Allocate nlmsg with 64-bit translaton of received 32-bit message */









	struct nlmsghdr *(*rcv_msg_compat)(const struct nlmsghdr *nlh,









			int maxtype, const struct nla_policy *policy,









			struct netlink_ext_ack *extack);



















	/* Translate 32-bit user_policy from sockptr */









	int (*xlate_user_policy_sockptr)(u8 **pdata32, int optlen);



















	struct module *owner;









};



















#if IS_ENABLED(CONFIG_XFRM_USER_COMPAT)









extern int xfrm_register_translator(struct xfrm_translator *xtr);









extern int xfrm_unregister_translator(struct xfrm_translator *xtr);









extern struct xfrm_translator *xfrm_get_translator(void);









extern void xfrm_put_translator(struct xfrm_translator *xtr);









#else









static inline struct xfrm_translator *xfrm_get_translator(void)









{









	return NULL;









}









static inline void xfrm_put_translator(struct xfrm_translator *xtr)









{









}









#endif



















#if IS_ENABLED(CONFIG_IPV6)









static inline bool xfrm6_local_dontfrag(const struct sock *sk)









{
































net/netlink/af_netlink.c



+33
−14






























Original line number
Diff line number
Diff line







@@ -2186,13 +2186,35 @@ EXPORT_SYMBOL(__nlmsg_put);







 * It would be better to create kernel thread.









 */



















static int netlink_dump_done(struct netlink_sock *nlk, struct sk_buff *skb,









			     struct netlink_callback *cb,









			     struct netlink_ext_ack *extack)









{









	struct nlmsghdr *nlh;



















	nlh = nlmsg_put_answer(skb, cb, NLMSG_DONE, sizeof(nlk->dump_done_errno),









			       NLM_F_MULTI | cb->answer_flags);









	if (WARN_ON(!nlh))









		return -ENOBUFS;



















	nl_dump_check_consistent(cb, nlh);









	memcpy(nlmsg_data(nlh), &nlk->dump_done_errno, sizeof(nlk->dump_done_errno));



















	if (extack->_msg && nlk->flags & NETLINK_F_EXT_ACK) {









		nlh->nlmsg_flags |= NLM_F_ACK_TLVS;









		if (!nla_put_string(skb, NLMSGERR_ATTR_MSG, extack->_msg))









			nlmsg_end(skb, nlh);









	}



















	return 0;









}



















static int netlink_dump(struct sock *sk)









{









	struct netlink_sock *nlk = nlk_sk(sk);









	struct netlink_ext_ack extack = {};









	struct netlink_callback *cb;









	struct sk_buff *skb = NULL;









	struct nlmsghdr *nlh;









	struct module *module;









	int err = -ENOBUFS;









	int alloc_min_size;








@@ -2258,22 +2280,19 @@ static int netlink_dump(struct sock *sk)







		return 0;









	}



















	nlh = nlmsg_put_answer(skb, cb, NLMSG_DONE,









			       sizeof(nlk->dump_done_errno),









			       NLM_F_MULTI | cb->answer_flags);









	if (WARN_ON(!nlh))









	if (netlink_dump_done(nlk, skb, cb, &extack))









		goto errout_skb;



















	nl_dump_check_consistent(cb, nlh);



















	memcpy(nlmsg_data(nlh), &nlk->dump_done_errno,









	       sizeof(nlk->dump_done_errno));



















	if (extack._msg && nlk->flags & NETLINK_F_EXT_ACK) {









		nlh->nlmsg_flags |= NLM_F_ACK_TLVS;









		if (!nla_put_string(skb, NLMSGERR_ATTR_MSG, extack._msg))









			nlmsg_end(skb, nlh);









#ifdef CONFIG_COMPAT_NETLINK_MESSAGES









	/* frag_list skb's data is used for compat tasks









	 * and the regular skb's data for normal (non-compat) tasks.









	 * See netlink_recvmsg().









	 */









	if (unlikely(skb_shinfo(skb)->frag_list)) {









		if (netlink_dump_done(nlk, skb_shinfo(skb)->frag_list, cb, &extack))









			goto errout_skb;









	}









#endif



















	if (sk_filter(sk, skb))









		kfree_skb(skb);
































net/xfrm/Kconfig



+11
−0






























Original line number
Diff line number
Diff line







@@ -28,6 +28,17 @@ config XFRM_USER

















	  If unsure, say Y.



















config XFRM_USER_COMPAT









	tristate "Compatible ABI support"









	depends on XFRM_USER && COMPAT_FOR_U64_ALIGNMENT && \









		HAVE_EFFICIENT_UNALIGNED_ACCESS









	select WANT_COMPAT_NETLINK_MESSAGES









	help









	  Transformation(XFRM) user configuration interface like IPsec









	  used by compatible Linux applications.



















	  If unsure, say N.



















config XFRM_INTERFACE









	tristate "Transformation virtual interface"









	depends on XFRM && IPV6
































net/xfrm/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -9,6 +9,7 @@ obj-$(CONFIG_XFRM) := xfrm_policy.o xfrm_state.o xfrm_hash.o \







obj-$(CONFIG_XFRM_STATISTICS) += xfrm_proc.o









obj-$(CONFIG_XFRM_ALGO) += xfrm_algo.o









obj-$(CONFIG_XFRM_USER) += xfrm_user.o









obj-$(CONFIG_XFRM_USER_COMPAT) += xfrm_compat.o









obj-$(CONFIG_XFRM_IPCOMP) += xfrm_ipcomp.o









obj-$(CONFIG_XFRM_INTERFACE) += xfrm_interface.o









obj-$(CONFIG_XFRM_ESPINTCP) += espintcp.o