From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.210.181 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794437516; b=qmDFIPzevGW7gqlMGdqICoNbCmwWuZ+EYwBrDzho4FbmWw+FB1YXdRV0kfxjMNRClnNG gJ6xppO+osIj4Tc48GvAAzZbfrEp5+ctV4m5rvaaWTStYWyWjvdsbmp9kf0jXXAMHJLFV Op4RnPmR3Kt3s21fpJ2gjgmyMvcgQM4DBi1OdwcaY5sox4XgiYFQij5SUZjoY4ovAdROn P7rFbEvwe+VqjstlNYXd2Xddt/ymX7CoVvwENmKJuX+HWRLszD9VItOHOknK35mtQ82QF Sy0gmP4N6E2UiJesrZavtj/VbK9MmKPxl0fgfd1Mui/3CT96Znq8a2c6y6qWsBWCp8A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794437516; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=b4bZKC8l/stVb8IdDlz7ZRPG3wHaoZ3G+SCD8Xq5KG0=; b=gQmM/FfymV2GA9hSkZzLY83VqgLIMxp68kN48z/NbrtSebGizfEaC6Byx+XNUemmAc79 87zRy3FpmE6AGFEr1Lm7w/zrO2B8CrPlSrPBVz4NsA/rmDRcmvBM8rWit5Pp4URlqpBFP 8XqkHHU8sELYn3otrPcTq59FnheuPtgz4LEbRRsUQrmoP6s9bZF0+vYfyR4Q9ik1Dr5yQ +gtRgl67JM7LNoo0fpq1A8kGeMjo509Mbtg+ZlXhnmBcWAQwDbzYJDkIslM/pu+H2T9MA G9codd7y3UjjC0ICnSnbRvW6plp/wIROf8UGUkqTDRnJliWQMXpPkpN/XxdDSvOEfzw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=vHKspmDp; arc=none smtp.remote-ip=209.85.210.181 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 E0923606A8AE for ; Wed, 11 Nov 2026 22:51:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org E0923606A8AE Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=vHKspmDp Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-8a0880a46e7so170341b3a.1 for ; Wed, 11 Nov 2026 14:51:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794437515; x=1795042315; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=b4bZKC8l/stVb8IdDlz7ZRPG3wHaoZ3G+SCD8Xq5KG0=; b=vHKspmDpUQ8KMm5L8YItAJAIwlu8eQo+5o/ptHXEIGWhUexMkRWiRpXSACYFv8wbeB 4e/z8EDqI/afq4BLX9eVob34Wp0D7juW2pHJffzCTZqQvSySNhYHJ4WPOXU3DvX08Gb4 MHbHefnN+YwIc4BP7rK8rfmhGuCD7Uk7h8czUGK3pjCyGn3vrQQK0qF2uXtty4h8hUhz yDBs7ULbKhKVo4HB6biUsKC8UTyu63jXzwD715WQVvcwBNyOIHaMZF6GpD8U4xPV6fhv GR8Bnbm8C8VvYwoGZ6CJMrYlwBfrZl6N95ov98VzRJRrjZx4A9vB/OGc+jpSXGEzsF+n acmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794437515; x=1795042315; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=b4bZKC8l/stVb8IdDlz7ZRPG3wHaoZ3G+SCD8Xq5KG0=; b=dMFJAi9lwcmM0zkzC2gCZ8lzzHdmZ2F+XhiKjplbkV4pRFhVQKgy57lC0yqVv3udBd xTb8zAn9ML4pcddbvgeFpT9ThA4y7WlvtTHiWGU4hugUMla8fksamxb+vq8Vn+TYNfs6 InxsyUZ5ljZ+5/ksqCtKa6hIKJnbo6z4rYLRU9C9dGVV2PG4KHIg4eBbOMM2fYRQOPHv RKtA1ii57yNfqOH2OBNyjkAZ2oOyva/E2dQ1MEBKCGi7NPYywGmKIDclnWFGtuFjysfg rBTSgTen12Kw4Ra0CVdhPU5uZ/hQATiEIk/D98OOgZohckQbiVnffMz51DNVBteqU02o te/Q== X-Forwarded-Encrypted: i=1; AL+hErFqK9ZqxeUZi4gY1V8AY58ZHMevZmVJwGY+45OR7CAvul3yVCpP8AXTd6uZhk0gtuQV2jf8MgM=@vger.kernel.org X-Gm-Message-State: APuU4Z9P/wx6Khgyc/jvW5cYn5zI6DEeIYqjwy9Okj42dyj22qY6S74o 5LY2gLtjJaAGPXRAqsfSQyNb40QyjXNAJf7CK2pl35wAO4bz/WnBOcjGh9LCIA== X-Gm-Gg: AYBFou1H0xP5Hc8mFGU+Hw3PLF8mpGPOwMSOeeEDUnrXiabZPPs/C19mrrCXTmmrqjQ cR37t1odaoZf6KQ7BrcITtySaglLAQ5Np7gP+7mg6eSMAdtpfjZA8SRElXt/eF1h68CioO15lA8 W/Axv6rtUMlb5oDDPJ4FgUrQsPMaUedQim8qlSmwvedS1bBp9tAmbBuCeJvBGnFP/M0JniS51D0 SCf26j7Zsy89xnCaWo2Oz4kSQoxx/P/wzGyL1ihfF6KQF4vXlFZyXg1m680+hP5uCHDKNm0YAjj hRvkPIDwNrHkzxXGdNq1TU2aeZJ5T7dR+D+zUy+X8Nnxhy+dmvPi4ihX+BX/zMAe+uFsHrPhiMH h+XnO9C/69PDHfh4C3ap3BmZ/MxIa2iVwBi8cY0d6DuQjylFsaK6GOr8Hf66lvaOhDHTs0whRSO oxeYgZzjTpYdmfwqrVNyBbbOlqedSsNpln40Ve7MNdAvF0nyVTAerUE89Ilix+6chWmoDv/ysro J5e7ep3Lwe/4xqK8svwmZw6tnF5JC8v+RzaTkt3yP8DQENYeumSPyJ8NuUfvaAzop1BOwOgHlnZ jvQi9XY66l7AGwryLgIn12HdS8vQtECDUJ2dFcBCXQrLs/HTzC8G+RU7eNAR2WcEdbCcg2HCem8 Lxtqt22ZUMIbnokj9mdUMVBVOaCC00ds8mL2dMM5p0NGdvsbZ48bpwc8/hQ5Rg6Jr0sPMPdifHp KQxwgn+N1WN/0qfzj1r9QeVFodnrnS+YHXmbqX4QTW X-Received: by 2002:a05:6a00:4b54:b0:8a6:8f27:d4d0 with SMTP id d2e1a72fcca58-8bd5bbc8438mr542029b3a.3.1794437515312; Wed, 11 Nov 2026 14:51:55 -0800 (PST) Received: from sid-dev-env.cgrhrlrrq2nuffriizdlnb1x4b.xx.internal.cloudapp.net ([4.155.54.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8baaa86dd0fsm2471575b3a.22.2026.11.11.14.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2026 14:51:54 -0800 (PST) From: Siddharth Chintamaneni To: Kuniyuki Iwashima , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , Shuah Khan , Kirill Tkhai , apais@microsoft.com, hargar@linux.microsoft.com, rlmenge@gmail.com, egoriluk@gmail.com, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Siddharth Chintamaneni Subject: [PATCH net v2 1/2] af_unix: Fix scm_stat.nr_fds leak in unix_dgram_disconnected(). Date: Wed, 11 Nov 2026 22:51:47 +0000 Message-ID: <20261111225148.88506-2-sidchintamaneni@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261111225148.88506-1-sidchintamaneni@gmail.com> References: <20261111225148.88506-1-sidchintamaneni@gmail.com> X-Mailing-List: netdev@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 When a connected SOCK_DGRAM socket disconnects (e.g. via connect() with AF_UNSPEC), reconnects to a different peer, or observes a dead peer in unix_dgram_sendmsg(), unix_dgram_disconnected() purges all unread datagrams from sk->sk_receive_queue via skb_queue_purge_reason(). Because skb_queue_purge_reason() frees each skb without calling scm_stat_del(sk, skb), any SCM_RIGHTS file descriptors attached to the purged skbs remain permanently accounted in u->scm_stat.nr_fds (reported as scm_fds in /proc//fdinfo/) for the remaining lifetime of the socket. Move scm_stat_add() and scm_stat_del() above unix_dgram_disconnected(), splice sk->sk_receive_queue onto a local list under the queue lock, and call scm_stat_del() before kfree_skb_reason() on each purged skb. Fixes: 3c32da19a858 ("unix: Show number of pending scm files of receive queue in fdinfo") Signed-off-by: Siddharth Chintamaneni --- net/unix/af_unix.c | 59 +++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 98fcfd7301f6..990a98330d9c 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -609,6 +609,28 @@ static void unix_write_space(struct sock *sk) rcu_read_unlock(); } +static void scm_stat_add(struct sock *sk, struct sk_buff *skb) +{ + struct scm_fp_list *fp = UNIXCB(skb).fp; + struct unix_sock *u = unix_sk(sk); + + if (unlikely(fp && fp->count)) { + atomic_add(fp->count, &u->scm_stat.nr_fds); + unix_add_edges(fp, u); + } +} + +static void scm_stat_del(struct sock *sk, struct sk_buff *skb) +{ + struct scm_fp_list *fp = UNIXCB(skb).fp; + struct unix_sock *u = unix_sk(sk); + + if (unlikely(fp && fp->count)) { + atomic_sub(fp->count, &u->scm_stat.nr_fds); + unix_del_edges(fp); + } +} + /* When dgram socket disconnects (or changes its peer), we clear its receive * queue of packets arrived from previous peer. First, it allows to do * flow control based only on wmem_alloc; second, sk connected to peer @@ -616,8 +638,19 @@ static void unix_write_space(struct sock *sk) static void unix_dgram_disconnected(struct sock *sk, struct sock *other) { if (!skb_queue_empty(&sk->sk_receive_queue)) { - skb_queue_purge_reason(&sk->sk_receive_queue, - SKB_DROP_REASON_UNIX_DISCONNECT); + struct sk_buff_head tmp; + struct sk_buff *skb; + + __skb_queue_head_init(&tmp); + + spin_lock(&sk->sk_receive_queue.lock); + skb_queue_splice_init(&sk->sk_receive_queue, &tmp); + spin_unlock(&sk->sk_receive_queue.lock); + + while ((skb = __skb_dequeue(&tmp)) != NULL) { + scm_stat_del(sk, skb); + kfree_skb_reason(skb, SKB_DROP_REASON_UNIX_DISCONNECT); + } wake_up_interruptible_all(&unix_sk(sk)->peer_wait); @@ -2058,28 +2091,6 @@ static bool unix_skb_scm_eq(const struct sock *sk, struct sk_buff *skb, unix_secdata_eq(scm, skb); } -static void scm_stat_add(struct sock *sk, struct sk_buff *skb) -{ - struct scm_fp_list *fp = UNIXCB(skb).fp; - struct unix_sock *u = unix_sk(sk); - - if (unlikely(fp && fp->count)) { - atomic_add(fp->count, &u->scm_stat.nr_fds); - unix_add_edges(fp, u); - } -} - -static void scm_stat_del(struct sock *sk, struct sk_buff *skb) -{ - struct scm_fp_list *fp = UNIXCB(skb).fp; - struct unix_sock *u = unix_sk(sk); - - if (unlikely(fp && fp->count)) { - atomic_sub(fp->count, &u->scm_stat.nr_fds); - unix_del_edges(fp); - } -} - static void unix_orphan_scm(struct sock *sk, struct sk_buff *skb) { scm_stat_del(sk, skb); -- 2.43.0