From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8EC1C29C325 for ; Fri, 5 Jun 2026 12:59:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780664397; cv=none; b=da3Z6GKYJmvTlBe2Ph39pXuY2ZUOCG12QmR6q5d5ml420pNC/HA7JKmKGfrRIQAPDkfb3gB1w9b2sAhXFq5tjE2DdoSpATsBjoNxw/I1Mv+PSeln/1HahNOxEP3aEIbZRWrvh2p5SuyGdZSU2pDlzB29Mv57x+y5vmEccnvJXRc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780664397; c=relaxed/simple; bh=MDYEVmmQv5JXRpTzTDDGmbfOYh3w0drWXj5n7XRlGbY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m4zuTbzZSUk6kA0GMTRRNC3VZMbYd3DW62hhUZQZY1TF4vS3Nhrqa2yjPhOTkvCBYDnnvrxcsxCXkGIvRUferQYi8kKHIGTInf4oyNSGvwHCnZsufyzMTHoFypSm1dxgIb9EUmRa4c04mwat1c84OZCg8os0Y4bT+ly6TxRzvdA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hzw/zUAZ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hzw/zUAZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF88D1F00893; Fri, 5 Jun 2026 12:59:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780664396; bh=ll0OmWyirpXNmHHp89ggJN1WGowPOc2ATDZGSJhgKUs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hzw/zUAZPvkxRkpNqB2KWfb+j5ceFsYtKT3wPiNJjxxG0SRtbzuCyFH3HkAWIM6Ra 4S5HYS92VRIwdQCx2ArL2fJx1G6533sFRXZ6mntFTZhWW4uySckydbuC7rUrKuLCsJ NAZ0ujtpF8njLr8qlZp3IVvpXFPFRdgck2CipUZM1z+ziw7ZulufTwAw2zztarKF+G dmwoT0ziBSdSY1MsVi9ywMAIoOegKbD+qMbG2nWjRzq3B55JH2ePD4uPonQuh5ja/q eLMS0ep+5ikDZiaicj39121+oR2RPSYAOjvOZCh5gd+HquPFD9x1zwGxT93EW1PSva Z90HEBtkmNVhA== From: Sasha Levin To: stable@vger.kernel.org Cc: Shaomin Chen , Steffen Klassert , Sasha Levin Subject: [PATCH 6.18.y] xfrm: iptfs: reset runtime state when cloning SAs Date: Fri, 5 Jun 2026 08:59:53 -0400 Message-ID: <20260605125953.366286-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026060404-supply-unglazed-218f@gregkh> References: <2026060404-supply-unglazed-218f@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Shaomin Chen [ Upstream commit 7f83d174073234839aea176f265e517e0d50a1d2 ] iptfs_clone_state() clones the IPTFS mode data with kmemdup(). This copies runtime objects which must not be shared with the original SA, including the embedded sk_buff_head, hrtimers, spinlock, and in-flight reassembly/reorder state. If xfrm_state_migrate() fails after clone_state() but before the later init_state() call has reinitialized those fields, the cloned state can be destroyed by xfrm_state_gc_task() with list and timer state copied from the original SA. With queued packets this lets the clone splice and free skbs owned by the original IPTFS queue, leading to use-after-free and double-free reports in iptfs_destroy_state() and skb release paths. Reinitialize the clone's runtime state before publishing it through x->mode_data. Because clone_state() now publishes a destroyable mode_data object before init_state(), take the mode callback module reference there. Avoid taking it again from __iptfs_init_state() for the same object. Fixes: 0e4fbf013fa5 ("xfrm: iptfs: add user packet (tunnel ingress) handling") Cc: stable@vger.kernel.org Signed-off-by: Shaomin Chen Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- net/xfrm/xfrm_iptfs.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/net/xfrm/xfrm_iptfs.c b/net/xfrm/xfrm_iptfs.c index 7cd97c1dcd1178..e11e4f7411fd25 100644 --- a/net/xfrm/xfrm_iptfs.c +++ b/net/xfrm/xfrm_iptfs.c @@ -2650,7 +2650,8 @@ static void __iptfs_init_state(struct xfrm_state *x, x->props.enc_hdr_len = sizeof(struct ip_iptfs_hdr); /* Always keep a module reference when x->mode_data is set */ - __module_get(x->mode_cbs->owner); + if (x->mode_data != xtfs) + __module_get(x->mode_cbs->owner); x->mode_data = xtfs; xtfs->x = x; @@ -2658,22 +2659,40 @@ static void __iptfs_init_state(struct xfrm_state *x, static int iptfs_clone_state(struct xfrm_state *x, struct xfrm_state *orig) { + struct skb_wseq *w_saved = NULL; struct xfrm_iptfs_data *xtfs; xtfs = kmemdup(orig->mode_data, sizeof(*xtfs), GFP_KERNEL); if (!xtfs) return -ENOMEM; - xtfs->ra_newskb = NULL; if (xtfs->cfg.reorder_win_size) { - xtfs->w_saved = kcalloc(xtfs->cfg.reorder_win_size, - sizeof(*xtfs->w_saved), GFP_KERNEL); - if (!xtfs->w_saved) { + w_saved = kcalloc(xtfs->cfg.reorder_win_size, + sizeof(*w_saved), GFP_KERNEL); + if (!w_saved) { kfree_sensitive(xtfs); return -ENOMEM; } } + xtfs->w_saved = w_saved; + + __skb_queue_head_init(&xtfs->queue); + xtfs->queue_size = 0; + hrtimer_setup(&xtfs->iptfs_timer, iptfs_delay_timer, CLOCK_MONOTONIC, + IPTFS_HRTIMER_MODE); + + spin_lock_init(&xtfs->drop_lock); + hrtimer_setup(&xtfs->drop_timer, iptfs_drop_timer, CLOCK_MONOTONIC, + IPTFS_HRTIMER_MODE); + xtfs->w_seq_set = false; + xtfs->w_wantseq = 0; + xtfs->w_savedlen = 0; + xtfs->ra_newskb = NULL; + xtfs->ra_wantseq = 0; + xtfs->ra_runtlen = 0; + + __module_get(x->mode_cbs->owner); x->mode_data = xtfs; xtfs->x = x; -- 2.53.0