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 A170D1F75A8; Tue, 3 Dec 2024 15:12:45 +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=1733238765; cv=none; b=qFVS96gJYbeK6bHYiOB+xlOGAc7UTiMWLg6dq6hCDeCaUaZxd8viMBwa5VVJm4EfG6VrssgZI34XuCLuYuqMEIMJ/FTyVrJHwnmjiZnBZ8g0neJ4qF+z861sWNOauVEN/WJiuu8JN7YuBDi7pnMAytb7lnwikP7jvjz0uhy/Seg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733238765; c=relaxed/simple; bh=xmObi7tLLuetvRIBhtWv4JZZZUi2VMiWQ/Pok2uLb1k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tmWrQYJdyaOiWpmabOrg0zuzMAWgfq9rQ+F7AcMvbiJNjiB/oZ4mxu1RcOwe/ExbWsoAx3cs61o8xwBe1VPlj93ReiKnVklSjcsm7dWlnRJXmwWTaYbKFQMOQ0ZS37GVBPEXqzcWkxBWAl3NWAntmH2sP9LH4EFs45jwqg9NVKA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Z/RpNlT1; 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="Z/RpNlT1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 299C4C4CECF; Tue, 3 Dec 2024 15:12:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733238765; bh=xmObi7tLLuetvRIBhtWv4JZZZUi2VMiWQ/Pok2uLb1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z/RpNlT1JZVnV86bByNyIFDArJ678HOlx7vCi+lHIbivOWS08sYjhM6Wm+YUzImdl PXMMNHfYk/gQxcOoLs0WkEQ4hJyzSy8NnjvvnDsnLAoSdFWcYXxsmKuYuwrKTNvnhp 8AcbCV7ZbvED7m7bMOLpB8xTqK3ghLHK7IjuC86k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vincent Whitchurch , Jiayuan Chen , John Fastabend , Martin KaFai Lau , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.11 373/817] bpf: fix recursive lock when verdict program return SK_PASS Date: Tue, 3 Dec 2024 15:39:05 +0100 Message-ID: <20241203144010.405279897@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiayuan Chen [ Upstream commit 8ca2a1eeadf09862190b2810697702d803ceef2d ] When the stream_verdict program returns SK_PASS, it places the received skb into its own receive queue, but a recursive lock eventually occurs, leading to an operating system deadlock. This issue has been present since v6.9. ''' sk_psock_strp_data_ready write_lock_bh(&sk->sk_callback_lock) strp_data_ready strp_read_sock read_sock -> tcp_read_sock strp_recv cb.rcv_msg -> sk_psock_strp_read # now stream_verdict return SK_PASS without peer sock assign __SK_PASS = sk_psock_map_verd(SK_PASS, NULL) sk_psock_verdict_apply sk_psock_skb_ingress_self sk_psock_skb_ingress_enqueue sk_psock_data_ready read_lock_bh(&sk->sk_callback_lock) <= dead lock ''' This topic has been discussed before, but it has not been fixed. Previous discussion: https://lore.kernel.org/all/6684a5864ec86_403d20898@john.notmuch Fixes: 6648e613226e ("bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue") Reported-by: Vincent Whitchurch Signed-off-by: Jiayuan Chen Signed-off-by: John Fastabend Acked-by: Martin KaFai Lau Link: https://patch.msgid.link/20241118030910.36230-2-mrpre@163.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/core/skmsg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/skmsg.c b/net/core/skmsg.c index bbf40b9997138..846fd672f0e52 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -1117,9 +1117,9 @@ static void sk_psock_strp_data_ready(struct sock *sk) if (tls_sw_has_ctx_rx(sk)) { psock->saved_data_ready(sk); } else { - write_lock_bh(&sk->sk_callback_lock); + read_lock_bh(&sk->sk_callback_lock); strp_data_ready(&psock->strp); - write_unlock_bh(&sk->sk_callback_lock); + read_unlock_bh(&sk->sk_callback_lock); } } rcu_read_unlock(); -- 2.43.0