diff options
author | Andrey Vagin <avagin@openvz.org> | 2017-02-01 14:00:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-02 21:58:02 -0500 |
commit | ba94f3088b792b16ea576a256a6030feddc87f24 (patch) | |
tree | 3295b00ebb6ddad72b5fa24c24d6c973598b91b8 /net/unix | |
parent | 2a7b6216692cd66f4c94e6ebb48e43038349ca7d (diff) |
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>
Diffstat (limited to 'net/unix')
-rw-r--r-- | net/unix/af_unix.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index cef79873b09d..e2d18b9f910f 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -117,6 +117,7 @@ | |||
117 | #include <net/checksum.h> | 117 | #include <net/checksum.h> |
118 | #include <linux/security.h> | 118 | #include <linux/security.h> |
119 | #include <linux/freezer.h> | 119 | #include <linux/freezer.h> |
120 | #include <linux/file.h> | ||
120 | 121 | ||
121 | struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE]; | 122 | struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE]; |
122 | EXPORT_SYMBOL_GPL(unix_socket_table); | 123 | EXPORT_SYMBOL_GPL(unix_socket_table); |
@@ -2592,6 +2593,43 @@ long unix_outq_len(struct sock *sk) | |||
2592 | } | 2593 | } |
2593 | EXPORT_SYMBOL_GPL(unix_outq_len); | 2594 | EXPORT_SYMBOL_GPL(unix_outq_len); |
2594 | 2595 | ||
2596 | static int unix_open_file(struct sock *sk) | ||
2597 | { | ||
2598 | struct path path; | ||
2599 | struct file *f; | ||
2600 | int fd; | ||
2601 | |||
2602 | if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) | ||
2603 | return -EPERM; | ||
2604 | |||
2605 | unix_state_lock(sk); | ||
2606 | path = unix_sk(sk)->path; | ||
2607 | if (!path.dentry) { | ||
2608 | unix_state_unlock(sk); | ||
2609 | return -ENOENT; | ||
2610 | } | ||
2611 | |||
2612 | path_get(&path); | ||
2613 | unix_state_unlock(sk); | ||
2614 | |||
2615 | fd = get_unused_fd_flags(O_CLOEXEC); | ||
2616 | if (fd < 0) | ||
2617 | goto out; | ||
2618 | |||
2619 | f = dentry_open(&path, O_PATH, current_cred()); | ||
2620 | if (IS_ERR(f)) { | ||
2621 | put_unused_fd(fd); | ||
2622 | fd = PTR_ERR(f); | ||
2623 | goto out; | ||
2624 | } | ||
2625 | |||
2626 | fd_install(fd, f); | ||
2627 | out: | ||
2628 | path_put(&path); | ||
2629 | |||
2630 | return fd; | ||
2631 | } | ||
2632 | |||
2595 | static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | 2633 | static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) |
2596 | { | 2634 | { |
2597 | struct sock *sk = sock->sk; | 2635 | struct sock *sk = sock->sk; |
@@ -2610,6 +2648,9 @@ static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
2610 | else | 2648 | else |
2611 | err = put_user(amount, (int __user *)arg); | 2649 | err = put_user(amount, (int __user *)arg); |
2612 | break; | 2650 | break; |
2651 | case SIOCUNIXFILE: | ||
2652 | err = unix_open_file(sk); | ||
2653 | break; | ||
2613 | default: | 2654 | default: |
2614 | err = -ENOIOCTLCMD; | 2655 | err = -ENOIOCTLCMD; |
2615 | break; | 2656 | break; |