pull request (net): ipsec 2020-12-07
Subsystems (3)
Steffen Klassert
maintainer1) Sysbot reported fixes for the new 64/32 bit compat layer. From Dmitry Safonov.
2) Fix a memory leak in xfrm_user_policy that was introduced by adding the 64/32 bit compat layer. From Yu Kuai.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit 4e0396c59559264442963b349ab71f66e471f84d:
net: marvell: prestera: fix compilation with CONFIG_BRIDGE=m (2020-11-07 12:43:26 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master
for you to fetch changes up to 48f486e13ffdb49fbb9b38c21d0e108ed60ab1a2:
net: xfrm: fix memory leak in xfrm_user_policy() (2020-11-10 09:14:25 +0100)
----------------------------------------------------------------
Dmitry Safonov (3):
xfrm/compat: Translate by copying XFRMA_UNSPEC attribute xfrm/compat: memset(0) 64-bit padding at right place xfrm/compat: Don't allocate memory with __GFP_ZERO
Steffen Klassert (1):
Merge branch 'xfrm/compat: syzbot-found fixes'
Yu Kuai (1):
net: xfrm: fix memory leak in xfrm_user_policy()
net/xfrm/xfrm_compat.c | 5 +++-- net/xfrm/xfrm_state.c | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-)
Steffen Klassert
maintainerPATCH 1/4 xfrm/compat: Translate by copying XFRMA_UNSPEC attribute
From: Dmitry Safonov <[email protected]>
xfrm_xlate32() translates 64-bit message provided by kernel to be sent for 32-bit listener (acknowledge or monitor). Translator code doesn't expect XFRMA_UNSPEC attribute as it doesn't know its payload. Kernel never attaches such attribute, but a user can.
I've searched if any opensource does it and the answer is no. Nothing on github and google finds only tfcproject that has such code commented-out.
What will happen if a user sends a netlink message with XFRMA_UNSPEC attribute? Ipsec code ignores this attribute. But if there is a monitor-process or 32-bit user requested ack - kernel will try to translate such message and will hit WARN_ONCE() in xfrm_xlate64_attr().
Deal with XFRMA_UNSPEC by copying the attribute payload with xfrm_nla_cpy(). In result, the default switch-case in xfrm_xlate64_attr() becomes an unused code. Leave those 3 lines in case a new xfrm attribute will be added.
--- net/xfrm/xfrm_compat.c | 1 + 1 file changed, 1 insertion(+)
net/xfrm/xfrm_compat.c +1 -0
@@ -234,6 +234,7 @@ static int xfrm_xlate64_attr(struct sk_buff *dst, const struct nlattr *src)case XFRMA_PAD :/* Ignore */ return 0 ; +case XFRMA_UNSPEC :case XFRMA_ALG_AUTH :case XFRMA_ALG_CRYPT :case XFRMA_ALG_COMP :
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 2/4 xfrm/compat: memset(0) 64-bit padding at right place
In reply to Steffen KlassertFrom: Dmitry Safonov <[email protected]>
32-bit messages translated by xfrm_compat can have attributes attached. For all, but XFRMA_SA, XFRMA_POLICY the size of payload is the same in 32-bit UABI and 64-bit UABI. For XFRMA_SA (struct xfrm_usersa_info) and XFRMA_POLICY (struct xfrm_userpolicy_info) it's only tail-padding that is present in 64-bit payload, but not in 32-bit.
The proper size for destination nlattr is already calculated by xfrm_user_rcv_calculate_len64() and allocated with kvmalloc().
xfrm_attr_cpy32() copies 32-bit copy_len into 64-bit attribute translated payload, zero-filling possible padding for SA/POLICY. Due to a typo, *pos already has 64-bit payload size, in a result next memset(0) is called on the memory after the translated attribute, not on the tail-padding of it.
--- net/xfrm/xfrm_compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_compat.c +1 -1
@@ -388,7 +388,7 @@ static int xfrm_attr_cpy32(void *dst, size_t *pos, const struct nlattr *src,memcpy (nla, src,nla_attr_size (copy_len)); nla->nla_len =nla_attr_size (payload); - *pos +=nla_attr_size (payload); + *pos +=nla_attr_size (copy_len); nlmsg->nlmsg_len += nla->nla_len;memset (dst + *pos,0 , payload - copy_len);
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 3/4 xfrm/compat: Don't allocate memory with __GFP_ZERO
In reply to Steffen KlassertFrom: Dmitry Safonov <[email protected]>
32-bit to 64-bit messages translator zerofies needed paddings in the translation, the rest is the actual payload.
Don't allocate zero pages as they are not needed.
--- net/xfrm/xfrm_compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_compat.c +1 -1
@@ -564,7 +564,7 @@ static struct nlmsghdr *xfrm_user_rcv_msg_compat(const struct nlmsghdr *h32,return NULL ; len +=NLMSG_HDRLEN ; - h64 =kvmalloc (len,GFP_KERNEL | __GFP_ZERO); + h64 =kvmalloc (len,GFP_KERNEL );if (!h64)return ERR_PTR (-ENOMEM );
Signature · 1 line
2.25.1
Steffen Klassert
maintainerPATCH 4/4 net: xfrm: fix memory leak in xfrm_user_policy()
In reply to Steffen KlassertFrom: Yu Kuai <[email protected]>
if xfrm_get_translator() failed, xfrm_user_policy() return without freeing 'data', which is allocated in memdup_sockptr().
--- net/xfrm/xfrm_state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/xfrm/xfrm_state.c +3 -1
@@ -2382,8 +2382,10 @@ int xfrm_user_policy(struct sock *sk, int optname, sockptr_t optval, int optlen)if (in_compat_syscall ()) {struct xfrm_translator *xtr =xfrm_get_translator (); -if (!xtr) +if (!xtr) { +kfree (data);return -EOPNOTSUPP ; + } err = xtr->xlate_user_policy_sockptr (&data, optlen);xfrm_put_translator (xtr);
Signature · 1 line
2.25.1
Jakub Kicinski
maintainerQuoted 5 lines · On Mon, 7 Dec 2020 10:39:33 +0100 Steffen Klassert wrote:
1) Sysbot reported fixes for the new 64/32 bit compat layer. From Dmitry Safonov.
2) Fix a memory leak in
xfrm_user_policythat was introduced by adding the 64/32 bit compat layer. From Yu Kuai.
Pulled, thank you!