netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kuniyuki Iwashima <kuniyu@amazon.com>
To: "David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Simon Horman <horms@kernel.org>
Cc: Donald Hunter <donald.hunter@redhat.com>,
	Kuniyuki Iwashima <kuniyu@amazon.com>,
	Kuniyuki Iwashima <kuni1840@gmail.com>, <netdev@vger.kernel.org>
Subject: [PATCH v1 net-next 04/12] af_unix: Set drop reason in __unix_gc().
Date: Fri, 10 Jan 2025 18:26:33 +0900	[thread overview]
Message-ID: <20250110092641.85905-5-kuniyu@amazon.com> (raw)
In-Reply-To: <20250110092641.85905-1-kuniyu@amazon.com>

Inflight file descriptors by SCM_RIGHTS hold references to the
struct file.

AF_UNIX sockets could hold references to each other, forming
reference cycles.

Once such sockets are close()d without the fd recv()ed, they
will be unaccessible from userspace but remain in kernel.

__unix_gc() garbage-collects skb with the dead file descriptors
and frees them by __skb_queue_purge().

Let's set SKB_DROP_REASON_SOCKET_CLOSE there.

  # echo 1 > /sys/kernel/tracing/events/skb/kfree_skb/enable

  # python3
  >>> from socket import *
  >>> from array import array
  >>>
  >>> # Create a reference cycle
  >>> s1 = socket(AF_UNIX, SOCK_DGRAM)
  >>> s1.bind('')
  >>> s1.sendmsg([b"nop"], [(SOL_SOCKET, SCM_RIGHTS, array("i", [s1.fileno()]))], 0, s1.getsockname())
  >>> s1.close()
  >>>
  >>> # Trigger GC
  >>> s2 = socket(AF_UNIX)
  >>> s2.close()

  # cat /sys/kernel/tracing/trace_pipe
  ...
     kworker/u16:2-42 ... kfree_skb: ... location=__unix_gc+0x4ad/0x580 reason: SOCKET_CLOSE

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
---
 net/unix/garbage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/unix/garbage.c b/net/unix/garbage.c
index 0068e758be4d..9848b7b78701 100644
--- a/net/unix/garbage.c
+++ b/net/unix/garbage.c
@@ -573,7 +573,7 @@ static void __unix_gc(struct work_struct *work)
 			UNIXCB(skb).fp->dead = true;
 	}
 
-	__skb_queue_purge(&hitlist);
+	__skb_queue_purge_reason(&hitlist, SKB_DROP_REASON_SOCKET_CLOSE);
 skip_gc:
 	WRITE_ONCE(gc_in_progress, false);
 }
-- 
2.39.5 (Apple Git-154)


  parent reply	other threads:[~2025-01-10  9:28 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-10  9:26 [PATCH v1 net-next 00/12] af_unix: Set skb drop reason in every kfree_skb() path Kuniyuki Iwashima
2025-01-10  9:26 ` [PATCH v1 net-next 01/12] net: dropreason: Gather SOCKET_ drop reasons Kuniyuki Iwashima
2025-01-10  9:26 ` [PATCH v1 net-next 02/12] af_unix: Set drop reason in unix_release_sock() Kuniyuki Iwashima
2025-01-10  9:26 ` [PATCH v1 net-next 03/12] af_unix: Set drop reason in unix_sock_destructor() Kuniyuki Iwashima
2025-01-10  9:26 ` Kuniyuki Iwashima [this message]
2025-01-10  9:26 ` [PATCH v1 net-next 05/12] af_unix: Set drop reason in unix_stream_connect() Kuniyuki Iwashima
2025-01-10  9:26 ` [PATCH v1 net-next 06/12] af_unix: Reuse out_pipe label in unix_stream_sendmsg() Kuniyuki Iwashima
2025-01-10 11:43   ` Simon Horman
2025-01-10 15:22     ` Kuniyuki Iwashima
2025-01-10 21:58       ` Joe Damato
2025-01-11  3:43         ` Kuniyuki Iwashima
2025-01-10  9:26 ` [PATCH v1 net-next 07/12] af_unix: Set drop reason " Kuniyuki Iwashima
2025-01-11  9:49   ` kernel test robot
2025-01-10  9:26 ` [PATCH v1 net-next 08/12] af_unix: Set drop reason in queue_oob() Kuniyuki Iwashima
2025-01-10  9:26 ` [PATCH v1 net-next 09/12] af_unix: Set drop reason in manage_oob() Kuniyuki Iwashima
2025-01-10  9:26 ` [PATCH v1 net-next 10/12] af_unix: Set drop reason in unix_stream_read_skb() Kuniyuki Iwashima
2025-01-10  9:26 ` [PATCH v1 net-next 11/12] af_unix: Set drop reason in unix_dgram_disconnected() Kuniyuki Iwashima
2025-01-10  9:26 ` [PATCH v1 net-next 12/12] af_unix: Set drop reason in unix_dgram_sendmsg() Kuniyuki Iwashima

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250110092641.85905-5-kuniyu@amazon.com \
    --to=kuniyu@amazon.com \
    --cc=davem@davemloft.net \
    --cc=donald.hunter@redhat.com \
    --cc=edumazet@google.com \
    --cc=horms@kernel.org \
    --cc=kuba@kernel.org \
    --cc=kuni1840@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).