33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
From b09f6edd9148cb08d70f8bad604efa064c9188e0 Mon Sep 17 00:00:00 2001
|
|
From: Daiki Ueno <ueno@gnu.org>
|
|
Date: Mon, 21 Oct 2024 09:25:06 +0900
|
|
Subject: [PATCH] pluto: fix refcounting of whack FD at CREATE_CHILD_SA request
|
|
|
|
After commit 6341e0d0257f26a7883bc5d1abff50ac362c625b, whack FD copied
|
|
to a larval Child SA in submit_v2_CREATE_CHILD_SA_new_child is not
|
|
properly closed at the completion of the CREATE_CHILD_SA exchange, as
|
|
new_v2_child_state increases the reference count of the whack FD
|
|
before sharing it with the IKE SA.
|
|
|
|
Signed-off-by: Daiki Ueno <ueno@gnu.org>
|
|
---
|
|
programs/pluto/ikev2_create_child_sa.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/programs/pluto/ikev2_create_child_sa.c b/programs/pluto/ikev2_create_child_sa.c
|
|
index 034266e7a6..951485d063 100644
|
|
--- a/programs/pluto/ikev2_create_child_sa.c
|
|
+++ b/programs/pluto/ikev2_create_child_sa.c
|
|
@@ -710,7 +710,7 @@ void submit_v2_CREATE_CHILD_SA_new_child(struct ike_sa *ike,
|
|
struct child_sa *larval_child = new_v2_child_state(c, ike, IPSEC_SA,
|
|
SA_INITIATOR,
|
|
STATE_V2_NEW_CHILD_I0,
|
|
- whackfd);
|
|
+ null_fd);
|
|
|
|
free_chunk_content(&larval_child->sa.st_ni); /* this is from the parent. */
|
|
free_chunk_content(&larval_child->sa.st_nr); /* this is from the parent. */
|
|
--
|
|
2.47.0
|
|
|