Skip to content

Commit 9bc3047

Browse files
Laszlo Ersekdavem330
authored andcommitted
net: tun_chr_open(): set sk_uid from current_fsuid()
Commit a096ccc initializes the "sk_uid" field in the protocol socket (struct sock) from the "/dev/net/tun" device node's owner UID. Per original commit 86741ec ("net: core: Add a UID field to struct sock.", 2016-11-04), that's wrong: the idea is to cache the UID of the userspace process that creates the socket. Commit 86741ec mentions socket() and accept(); with "tun", the action that creates the socket is open("/dev/net/tun"). Therefore the device node's owner UID is irrelevant. In most cases, "/dev/net/tun" will be owned by root, so in practice, commit a096ccc has no observable effect: - before, "sk_uid" would be zero, due to undefined behavior (CVE-2023-1076), - after, "sk_uid" would be zero, due to "/dev/net/tun" being owned by root. What matters is the (fs)UID of the process performing the open(), so cache that in "sk_uid". Cc: Eric Dumazet <edumazet@google.com> Cc: Lorenzo Colitti <lorenzo@google.com> Cc: Paolo Abeni <pabeni@redhat.com> Cc: Pietro Borrello <borrello@diag.uniroma1.it> Cc: netdev@vger.kernel.org Cc: stable@vger.kernel.org Fixes: a096ccc ("tun: tun_chr_open(): correctly initialize socket uid") Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2173435 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 31d49ba commit 9bc3047

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/tun.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3469,7 +3469,7 @@ static int tun_chr_open(struct inode *inode, struct file * file)
34693469
tfile->socket.file = file;
34703470
tfile->socket.ops = &tun_socket_ops;
34713471

3472-
sock_init_data_uid(&tfile->socket, &tfile->sk, inode->i_uid);
3472+
sock_init_data_uid(&tfile->socket, &tfile->sk, current_fsuid());
34733473

34743474
tfile->sk.sk_write_space = tun_sock_write_space;
34753475
tfile->sk.sk_sndbuf = INT_MAX;

0 commit comments

Comments
 (0)