From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=95.215.58.189 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795257346; b=vrIuqVpnw5yPcgvL7IEdH6c1MF8bJNbLrdD7e1z7/xeQfIOYJjby1sp4BJGO+gYpAsRc BTyQYnpqpnM4PB40Hmcb5PtkitRHBtPGsRm8TxMNuF6yDTNo2Qu/QWG0f4AEECuGbp16k 2QCXZrbDKCIZjKSVCao4ljj5CXaZXR4aKxUsAS8oi+2hKclMio/n/0zTWc8fasoc4/04K OeIalROv3KQ/QGCSNM/4eohv+SiABwaONxIA2SYiUcISZ5tP9oHIF/CbK4UIPFfjRQoH2 K/yhi1Bq+qExVoJudVLAW/Y1XCh1uKlYqOMyY4r54+AeJgTtnP660ijLtFhWzIcgM+A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795257346; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=L5hGurAKkqpLz3Gfdlsx327sieYg5Z9sWpnZsySfpsg=; b=CM2sFQJDUs4kASTMvjq384n0mt4CaQp3YZ7iOs1DugdGpIaULeWNZjyCb61RURA8qhVf IuIx+luSbGbZJWblY9Pce9s5NJo1VHmpzJ2qcx2z34T926l5xoRrtvBJQxMhQ++1Z/MyE Pzq+1aW688tUwZlEus6bkE16mSKoQh1xn4KBXoi8JFH7LMVjeV8khfCMeh+HZctiuWQs6 87jZ51HGW5sH0ViS7Mp6s6j7thLYQNJ+m7mWCsHdUm4GwOPTcxLQnJkh3mwkXRxmxW+Oz PEzeyDh6Pfg2jxlHKecHHvW7NhZ5f04gEZ11/Q0wR/rwoNLTzq3RHsueJBQO6592pMA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=RJuf+wUK; arc=none smtp.remote-ip=95.215.58.189 Received: from mta1.migadu.com (out-189.mta1.migadu.com [95.215.58.189]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F4000606A337 for ; Sat, 21 Nov 2026 10:35:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org F4000606A337 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=RJuf+wUK X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=8LRbPdILLLhIs0nbG++RshFwNSImlc2aG5lW6OMeSRo=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1795257344; v=1; x=1795862144; b=RJuf+wUKrRtgLDPut++/uE64Egc4muDpvsFI+4l1PRY5aWt7dWohZAOPbtKRv0jd8vY5f2m9 pLKLIFMyM8v2AIsNFcx/nCUG0r/20NnYQEsflxvMsfrqmG6fyRW7qcmgfeVTGTOq3saA2kLApUr C/0pZ7Svvs/KA1Tv4xjHXMhY= X-Envelope-To: linux-kernel@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id 826288e3b8d86c17; Sat, 21 Nov 2026 10:35:39 +0000 X-Mizu-Trace-ID: 826288e3b8d86c17 X-Migadu-Flow: FLOW_OUT From: Jiayuan Chen To: bpf@vger.kernel.org, ast@kernel.org Cc: Jiayuan Chen , John Fastabend , Jakub Sitnicki , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Kuniyuki Iwashima , Willem de Bruijn , Neal Cardwell , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Ihor Solodrai , Shuah Khan , Sechang Lim , Michal Luczaj , Mattia Meleleo , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf 07/11] bpf, sockmap: Fix psock refcnt taken in sk_psock_backlog() Date: Sat, 21 Nov 2026 18:30:08 +0800 Message-ID: <20261121103222.88209-8-jiayuan.chen@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261121103222.88209-1-jiayuan.chen@linux.dev> References: <20261121103222.88209-1-jiayuan.chen@linux.dev> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit sk_psock_backlog() runs for a given psock, but takes the reference with sk_psock_get(psock->sk), which returns the psock that sk_user_data points to now. That is the same psock only while psock->sk->psock == psock. If sk is removed from the map and added back while the backlog runs, the old psock is dropped and sk_user_data points to the new one. The backlog of the old psock then takes a reference on the new psock and puts the old one, whose refcnt is already 0. The old one hits a refcount underflow and the new one leaks a reference. The SK_PSOCK_TX_ENABLED check before it does not close this window. Take the reference on the psock itself. Fixes: 8259eb0e06d8 ("bpf, sockmap: Avoid using sk_socket after free when sending") Signed-off-by: Jiayuan Chen --- net/core/skmsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 43dc128841e98..52469318fb577 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -704,7 +704,7 @@ static void sk_psock_backlog(struct work_struct *work) * before sk_socket freed. If refcnt increment fails, it indicates * sock_map_close() completed with sk_socket potentially already freed. */ - if (!sk_psock_get(psock->sk)) + if (!refcount_inc_not_zero(&psock->refcnt)) return; mutex_lock(&psock->work_mutex); while ((skb = skb_peek(&psock->ingress_skb))) { -- 2.43.0