Skip to contentSkip to conversation

pull request (net): ipsec 2019-11-13

PATCH New Steffen Klassert 2 participants 4 messages Nov 13, 2019

Subsystems (3)
lore
Share & tools
lore

Steffen Klassert

author maintainer
#0 lore raw

1) Fix a page memleak on xfrm state destroy.

2) Fix a refcount imbalance if a xfrm_state
gets invaild during async resumption.
From Xiaodong Xu.

Please pull or let me know if there are problems.

Thanks!

The following changes since commit 99a8efbb6e30b72ac98cecf81103f847abffb1e5:

NFC: st21nfca: fix double free (2019-11-06 21:48:29 -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 4944a4b1077f74d89073624bd286219d2fcbfce3:

xfrm: release device reference for invalid state (2019-11-12 08:24:38 +0100)

----------------------------------------------------------------
Steffen Klassert (1):
xfrm: Fix memleak on xfrm state destroy

Xiaodong Xu (1):
xfrm: release device reference for invalid state

 net/xfrm/xfrm_input.c | 3 +++
 net/xfrm/xfrm_state.c | 2 ++
 2 files changed, 5 insertions(+)
author maintainer
#1 lore raw

PATCH 1/2 xfrm: Fix memleak on xfrm state destroy

We leak the page that we use to create skb page fragments when destroying the xfrm_state. Fix this by dropping a page reference if a page was assigned to the xfrm_state.

Fixes cac2661c53f3 ("esp4: Avoid skb_cow_data whenever possible")
---
 net/xfrm/xfrm_state.c | 2 ++
 1 file changed, 2 insertions(+)
net/xfrm/xfrm_state.c +2 -0
index c6f3c4a1bd99..f3423562d933 100644
@@ -495,6 +495,8 @@ static void ___xfrm_state_destroy(struct xfrm_state *x)
 		x->type->destructor(x);
 		xfrm_put_type(x->type);
 	}
+	if (x->xfrag.page)
+		put_page(x->xfrag.page);
 	xfrm_dev_state_free(x);
 	security_xfrm_state_free(x);
 	xfrm_state_free(x);
Signature · 1 line
2.17.1
author maintainer
#2 lore raw

PATCH 2/2 xfrm: release device reference for invalid state

In reply to Steffen Klassert

From: Xiaodong Xu <[email protected]>

An ESP packet could be decrypted in async mode if the input handler for this packet returns -EINPROGRESS in xfrm_input(). At this moment the device reference in skb is held. Later xfrm_input() will be invoked again to resume the processing.
If the transform state is still valid it would continue to release the device reference and there won't be a problem; however if the transform state is not valid when async resumption happens, the packet will be dropped while the device reference is still being held.
When the device is deleted for some reason and the reference to this device is not properly released, the kernel will keep logging like:

unregister_netdevice: waiting for ppp2 to become free. Usage count = 1

The issue is observed when running IPsec traffic over a PPPoE device based on a bridge interface. By terminating the PPPoE connection on the server end for multiple times, the PPPoE device on the client side will eventually get stuck on the above warning message.

This patch will check the async mode first and continue to release device reference in async resumption, before it is dropped due to invalid state.

v2: Do not assign address family from outer_mode in the transform if the state is invalid

v3: Release device reference in the error path instead of jumping to resume

Fixes 4ce3dbe397d7b ("xfrm: Fix xfrm_input() to verify state is valid when (encap_type < 0)")
---
 net/xfrm/xfrm_input.c | 3 +++
 1 file changed, 3 insertions(+)
net/xfrm/xfrm_input.c +3 -0
index 9b599ed66d97..2c86a2fc3915 100644
@@ -480,6 +480,9 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
 			else
 				XFRM_INC_STATS(net,
 					       LINUX_MIB_XFRMINSTATEINVALID);
+
+			if (encap_type == -1)
+				dev_put(skb->dev);
 			goto drop;
 		}
 
Signature · 1 line
2.17.1
maintainer
#3 lore raw
In reply to Steffen Klassert

From: Steffen Klassert <[email protected]>
Date: Wed, 13 Nov 2019 12:26:11 +0100

Quoted 7 lines

1) Fix a page memleak on xfrm state destroy.

2) Fix a refcount imbalance if a xfrm_state
gets invaild during async resumption.
From Xiaodong Xu.

Please pull or let me know if there are problems.

Pulled, thanks Steffen.