All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
	Steffen Klassert <steffen.klassert@secunet.com>,
	<netdev@vger.kernel.org>
Subject: [PATCH 01/10] xfrm: drop SA reference in xfrm_state_update if dir doesn't match
Date: Tue, 18 Nov 2025 09:52:34 +0100	[thread overview]
Message-ID: <20251118085344.2199815-2-steffen.klassert@secunet.com> (raw)
In-Reply-To: <20251118085344.2199815-1-steffen.klassert@secunet.com>

From: Sabrina Dubroca <sd@queasysnail.net>

We're not updating x1, but we still need to put() it.

Fixes: a4a87fa4e96c ("xfrm: Add Direction to the SA in or out")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
 net/xfrm/xfrm_state.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index d213ca3653a8..e4736d1ebb44 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -2191,14 +2191,18 @@ int xfrm_state_update(struct xfrm_state *x)
 	}
 
 	if (x1->km.state == XFRM_STATE_ACQ) {
-		if (x->dir && x1->dir != x->dir)
+		if (x->dir && x1->dir != x->dir) {
+			to_put = x1;
 			goto out;
+		}
 
 		__xfrm_state_insert(x);
 		x = NULL;
 	} else {
-		if (x1->dir != x->dir)
+		if (x1->dir != x->dir) {
+			to_put = x1;
 			goto out;
+		}
 	}
 	err = 0;
 
-- 
2.43.0


  reply	other threads:[~2025-11-18  8:54 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-18  8:52 [PATCH 0/10] pull request (net): ipsec 2025-11-18 Steffen Klassert
2025-11-18  8:52 ` Steffen Klassert [this message]
2025-11-19  2:10   ` [PATCH 01/10] xfrm: drop SA reference in xfrm_state_update if dir doesn't match patchwork-bot+netdevbpf
2025-11-18  8:52 ` [PATCH 02/10] xfrm: also call xfrm_state_delete_tunnel at destroy time for states that were never added Steffen Klassert
2025-11-18  8:52 ` [PATCH 03/10] xfrm: make state as DEAD before final put when migrate fails Steffen Klassert
2025-11-18  8:52 ` [PATCH 04/10] xfrm: call xfrm_dev_state_delete when xfrm_state_migrate fails to add the state Steffen Klassert
2025-11-18  8:52 ` [PATCH 05/10] xfrm: set err and extack on failure to create pcpu SA Steffen Klassert
2025-11-18  8:52 ` [PATCH 06/10] xfrm: check all hash buckets for leftover states during netns deletion Steffen Klassert
2025-11-18  8:52 ` [PATCH 07/10] xfrm: Check inner packet family directly from skb_dst Steffen Klassert
2025-11-18  8:52 ` [PATCH 08/10] xfrm: Determine inner GSO type from packet inner protocol Steffen Klassert
2025-11-18  8:52 ` [PATCH 09/10] xfrm: Prevent locally generated packets from direct output in tunnel mode Steffen Klassert
2025-11-18  8:52 ` [PATCH 10/10] xfrm: fix memory leak in xfrm_add_acquire() Steffen Klassert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251118085344.2199815-2-steffen.klassert@secunet.com \
    --to=steffen.klassert@secunet.com \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.