Netdev List
 help / color / mirror / Atom feed
From: Ziheng Wei <zihengw03@163.com>
To: Andrew Lunn <andrew+netdev@lunn.ch>,
	"David S . Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@kernel.org>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Kuniyuki Iwashima <kuniyu@google.com>,
	Willem de Bruijn <willemb@google.com>,
	Simon Horman <horms@kernel.org>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next v2] net: do not use SOCK_INODE() in sock_init_data_uid()
Date: Thu, 19 Nov 2026 18:04:14 +0800	[thread overview]
Message-ID: <20261119100414.13635-1-zihengw03@163.com> (raw)

Since commit 5d6b58c932ec ("net: lockless sock_i_ino()"),
sk_set_socket() reads i_uid and i_ino through SOCK_INODE(sock).
sock_init_data_uid() calls sk_set_socket(), but its only direct users
are tun and tap, which pass &tfile->socket and &q->sock. Those sockets
are embedded in struct tun_file and struct tap_queue, not in a struct
socket_alloc, so SOCK_INODE() points at whatever follows the socket in
those structures and both reads return unrelated data.

sk_uid is overwritten a few lines later with the uid passed in, and
nothing reads sk_ino of a tun or tap socket today, so the result is
not used. The reads themselves are still out of type, and with
CONFIG_RANDSTRUCT the inode fields can land beyond the end of struct
tap_queue.

sock_init_data_uid() was added so that tun and tap would not use
SOCK_INODE() on these sockets. Set sk_socket directly there, clear
sk_ino, and let sock_init_data(), whose sockets always come from
sockfs, fill in sk_ino.

Found by LLM-assisted source review and confirmed by code inspection
only; the out-of-type reads were not triggered at runtime. The fix was
build tested only; it was not run against selftests.

Fixes: 5d6b58c932ec ("net: lockless sock_i_ino()")
Signed-off-by: Ziheng Wei <zihengw03@163.com>
---

Notes:
    Changes in v2:
    - Use plain assignments for sk_socket and sk_ino during socket
      initialization, before the socket is published (suggested by Kuniyuki
      Iwashima)
    - v1: https://lore.kernel.org/all/20261115161820.941166-1-zihengw03@163.com/
    
    The changelog was drafted with an AI assistant from my analysis;
    I have reviewed the code, the fix and the text.

 net/core/sock.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/net/core/sock.c b/net/core/sock.c
index ad414878d..ce7e1cf0d 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3831,7 +3831,11 @@ void sock_init_data_uid(struct socket *sock, struct sock *sk, kuid_t uid)
 	sk->sk_sndbuf		=	READ_ONCE(sysctl_wmem_default);
 	sk->sk_state		=	TCP_CLOSE;
 	sk->sk_use_task_frag	=	true;
-	sk_set_socket(sk, sock);
+	/* tun and tap pass a socket that is not part of a socket_alloc, so
+	 * SOCK_INODE() must not be used here. sock_init_data() sets sk_ino.
+	 */
+	sk->sk_socket = sock;
+	sk->sk_ino = 0;
 
 	sock_set_flag(sk, SOCK_ZAPPED);
 
@@ -3897,6 +3901,8 @@ void sock_init_data(struct socket *sock, struct sock *sk)
 		make_kuid(sock_net(sk)->user_ns, 0);
 
 	sock_init_data_uid(sock, sk, uid);
+	if (sock)
+		sk->sk_ino = SOCK_INODE(sock)->i_ino;
 }
 EXPORT_SYMBOL(sock_init_data);
 
base-commit: 97d73c8251226cf27cc6656b4c542869bb8c69fa
-- 
2.43.0


             reply	other threads:[~2026-11-19 10:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-19 10:04 Ziheng Wei [this message]
2026-11-19 10:07 ` [PATCH net-next v2] net: do not use SOCK_INODE() in sock_init_data_uid() Eric Dumazet
2026-11-21 19:01 ` 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=20261119100414.13635-1-zihengw03@163.com \
    --to=zihengw03@163.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=edumazet@kernel.org \
    --cc=horms@kernel.org \
    --cc=kuba@kernel.org \
    --cc=kuniyu@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=willemb@google.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