From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6087814012; Mon, 24 Feb 2025 14:40:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740408043; cv=none; b=Xk8MbDGqK3/+Nb2A9Y9kcVJawTojgk2PavWN12Wwi77mSSQ3qBRszwGShzMgHb01uuoirQ88LwPIL59U7wMmDL4zgZQXyVCyD5u9TfvaGU8Zj5nGEtdlI/TAmkAXcrEu32iyvlVbdA3PrrzoZQiLYPSh5SPy13UDUFrRaNY04vk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740408043; c=relaxed/simple; bh=TX96pNPHaMlHU2klFSjacstrWXzUzqMYeKQlQWXyO3Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lMgdbgoR8WsEk416oxECE8pFLHWJhewwUgJAwfNOSS54jwpVzg04gnP2BV2z/MJGyEa3Ky1UeDzO0MK7kjNJReOX4UHsTR+TECGQ4KIoMVZFij0hZlPFtk9AF119+q9IxfO2AyNLVc6ec5i9+Pc/SUIMa9c2/hRbhPc1BzsTPbo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kN51EkBs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kN51EkBs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D60F1C4CED6; Mon, 24 Feb 2025 14:40:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1740408043; bh=TX96pNPHaMlHU2klFSjacstrWXzUzqMYeKQlQWXyO3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kN51EkBsIPYDhubWxuNo1Vup/qW9Bj4YPtTVrgtHfH2iFqR84bwKZfGze3LMx3op+ DjmMvWguyCdBnzADa+Rwz+bYmZDIPJzA9CzyjvhNYFzX0QVeOY7t5OaPCXJpyGfzSc h2utwT6koJH5UHUJLEZKqlFo8dh2hJ2Lcy+KbEzQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kuniyuki Iwashima , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 083/140] geneve: Suppress list corruption splat in geneve_destroy_tunnels(). Date: Mon, 24 Feb 2025 15:34:42 +0100 Message-ID: <20250224142606.272308978@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224142602.998423469@linuxfoundation.org> References: <20250224142602.998423469@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kuniyuki Iwashima [ Upstream commit 62fab6eef61f245dc8797e3a6a5b890ef40e8628 ] As explained in the previous patch, iterating for_each_netdev() and gn->geneve_list during ->exit_batch_rtnl() could trigger ->dellink() twice for the same device. If CONFIG_DEBUG_LIST is enabled, we will see a list_del() corruption splat in the 2nd call of geneve_dellink(). Let's remove for_each_netdev() in geneve_destroy_tunnels() and delegate that part to default_device_exit_batch(). Fixes: 9593172d93b9 ("geneve: Fix use-after-free in geneve_find_dev().") Signed-off-by: Kuniyuki Iwashima Link: https://patch.msgid.link/20250217203705.40342-3-kuniyu@amazon.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/geneve.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index c2066f19295d4..27761334e1bff 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -1961,14 +1961,7 @@ static void geneve_destroy_tunnels(struct net *net, struct list_head *head) { struct geneve_net *gn = net_generic(net, geneve_net_id); struct geneve_dev *geneve, *next; - struct net_device *dev, *aux; - /* gather any geneve devices that were moved into this ns */ - for_each_netdev_safe(net, dev, aux) - if (dev->rtnl_link_ops == &geneve_link_ops) - geneve_dellink(dev, head); - - /* now gather any other geneve devices that were created in this ns */ list_for_each_entry_safe(geneve, next, &gn->geneve_list, next) geneve_dellink(geneve->dev, head); } -- 2.39.5