Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

unix: add ioctl to open a unix socket file with O_PATH

This ioctl opens a file to which a socket is bound and
returns a file descriptor. The caller has to have CAP_NET_ADMIN
in the socket network namespace.

Currently it is impossible to get a path and a mount point
for a socket file. socket_diag reports address, device ID and inode
number for unix sockets. An address can contain a relative path or
a file may be moved somewhere. And these properties say nothing about
a mount namespace and a mount point of a socket file.

With the introduced ioctl, we can get a path by reading
/proc/self/fd/X and get mnt_id from /proc/self/fdinfo/X.

In CRIU we are going to use this ioctl to dump and restore unix socket.

Here is an example how it can be used:

$ strace -e socket,bind,ioctl ./test /tmp/test_sock
socket(AF_UNIX, SOCK_STREAM, 0) = 3
bind(3, {sa_family=AF_UNIX, sun_path="test_sock"}, 11) = 0
ioctl(3, SIOCUNIXFILE, 0) = 4
^Z

$ ss -a | grep test_sock
u_str LISTEN 0 1 test_sock 17798 * 0

$ ls -l /proc/760/fd/{3,4}
lrwx------ 1 root root 64 Feb 1 09:41 3 -> 'socket:[17798]'
l--------- 1 root root 64 Feb 1 09:41 4 -> /tmp/test_sock

$ cat /proc/760/fdinfo/4
pos: 0
flags: 012000000
mnt_id: 40

$ cat /proc/self/mountinfo | grep "^40\s"
40 19 0:37 / /tmp rw shared:23 - tmpfs tmpfs rw

Signed-off-by: Andrei Vagin <avagin@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Andrey Vagin and committed by
David S. Miller
ba94f308 2a7b6216

+43
+2
include/uapi/linux/un.h
··· 10 10 char sun_path[UNIX_PATH_MAX]; /* pathname */ 11 11 }; 12 12 13 + #define SIOCUNIXFILE (SIOCPROTOPRIVATE + 0) /* open a socket file with O_PATH */ 14 + 13 15 #endif /* _LINUX_UN_H */
+41
net/unix/af_unix.c
··· 117 117 #include <net/checksum.h> 118 118 #include <linux/security.h> 119 119 #include <linux/freezer.h> 120 + #include <linux/file.h> 120 121 121 122 struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE]; 122 123 EXPORT_SYMBOL_GPL(unix_socket_table); ··· 2593 2592 } 2594 2593 EXPORT_SYMBOL_GPL(unix_outq_len); 2595 2594 2595 + static int unix_open_file(struct sock *sk) 2596 + { 2597 + struct path path; 2598 + struct file *f; 2599 + int fd; 2600 + 2601 + if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) 2602 + return -EPERM; 2603 + 2604 + unix_state_lock(sk); 2605 + path = unix_sk(sk)->path; 2606 + if (!path.dentry) { 2607 + unix_state_unlock(sk); 2608 + return -ENOENT; 2609 + } 2610 + 2611 + path_get(&path); 2612 + unix_state_unlock(sk); 2613 + 2614 + fd = get_unused_fd_flags(O_CLOEXEC); 2615 + if (fd < 0) 2616 + goto out; 2617 + 2618 + f = dentry_open(&path, O_PATH, current_cred()); 2619 + if (IS_ERR(f)) { 2620 + put_unused_fd(fd); 2621 + fd = PTR_ERR(f); 2622 + goto out; 2623 + } 2624 + 2625 + fd_install(fd, f); 2626 + out: 2627 + path_put(&path); 2628 + 2629 + return fd; 2630 + } 2631 + 2596 2632 static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 2597 2633 { 2598 2634 struct sock *sk = sock->sk; ··· 2647 2609 err = amount; 2648 2610 else 2649 2611 err = put_user(amount, (int __user *)arg); 2612 + break; 2613 + case SIOCUNIXFILE: 2614 + err = unix_open_file(sk); 2650 2615 break; 2651 2616 default: 2652 2617 err = -ENOIOCTLCMD;