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 73AA314EC58; Tue, 23 Jul 2024 18:39:09 +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=1721759949; cv=none; b=oH2VH0FyqeP26zLTLVxR4rVYKQmygSi0/+l2D4ovJnwAeVPtN97kxg+H2SDwk/N+4OXFi10zL/evYGr/0o6CS6I1nJMBj5AfATMfv8THV8zPKjgmWQvsNikxcV354w8cbn79D6zjIMCrKEeMYWVM57m+t8UsR66nSZw4Jtop5vA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759949; c=relaxed/simple; bh=EsfnKMT8x3Xon3ved2L0AYWpLQX/eDHoLiMOcaoeOv0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aZ5WdgJDxsrwyoBDzoP1NkcYHU9WINaIbdry85W4HB/6R91IqY7W3rL7PSYGwmIH/iakkZZZuo8VkFDUQemiyl1SpfUOpniBipSOkhz4WV7ojZBebTZSkGI1pUWL3vV2Dt08hYZEuJLn8K9WH3HmDEpDfN9nYoiUQNkwws3ETIQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZWD62B1F; 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="ZWD62B1F" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9665C4AF0A; Tue, 23 Jul 2024 18:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721759949; bh=EsfnKMT8x3Xon3ved2L0AYWpLQX/eDHoLiMOcaoeOv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZWD62B1FOYz1xKwwLdEJ2jT3VAwV1zn3oKge9DFjt5h4zdPKnAYuGOq7U4f6W5zlm TRHN2SmGwlLcEqclKMVV3VbfJc1EDQtZqztiTiQfUYzsqEO5hLPZPizoEYzxYrQ2wp 44Ar2iWVUCiC8VsvXiolUfgMLWxDzdgW2MxMCWQs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Paolo Abeni , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.9 035/163] ila: block BH in ila_output() Date: Tue, 23 Jul 2024 20:22:44 +0200 Message-ID: <20240723180144.828557935@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180143.461739294@linuxfoundation.org> References: <20240723180143.461739294@linuxfoundation.org> User-Agent: quilt/0.67 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.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit cf28ff8e4c02e1ffa850755288ac954b6ff0db8c ] As explained in commit 1378817486d6 ("tipc: block BH before using dst_cache"), net/core/dst_cache.c helpers need to be called with BH disabled. ila_output() is called from lwtunnel_output() possibly from process context, and under rcu_read_lock(). We might be interrupted by a softirq, re-enter ila_output() and corrupt dst_cache data structures. Fix the race by using local_bh_disable(). Signed-off-by: Eric Dumazet Acked-by: Paolo Abeni Link: https://lore.kernel.org/r/20240531132636.2637995-5-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv6/ila/ila_lwt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/ipv6/ila/ila_lwt.c b/net/ipv6/ila/ila_lwt.c index 0601bad798221..ff7e734e335b0 100644 --- a/net/ipv6/ila/ila_lwt.c +++ b/net/ipv6/ila/ila_lwt.c @@ -58,7 +58,9 @@ static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb) return orig_dst->lwtstate->orig_output(net, sk, skb); } + local_bh_disable(); dst = dst_cache_get(&ilwt->dst_cache); + local_bh_enable(); if (unlikely(!dst)) { struct ipv6hdr *ip6h = ipv6_hdr(skb); struct flowi6 fl6; @@ -86,8 +88,11 @@ static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb) goto drop; } - if (ilwt->connected) + if (ilwt->connected) { + local_bh_disable(); dst_cache_set_ip6(&ilwt->dst_cache, dst, &fl6.saddr); + local_bh_enable(); + } } skb_dst_set(skb, dst); -- 2.43.0