diff options
| author | Kees Cook <keescook@chromium.org> | 2020-06-10 20:47:45 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2020-07-13 11:03:44 -0700 |
| commit | deefa7f3505ae2fb6a7cb75f50134b65a1dd1494 (patch) | |
| tree | 4147bf6aa14904b8e7cf4e1aaf9f39ac6a82a149 /net | |
| parent | 6659061045cc93f609e100b128f30581e5f012e9 (diff) | |
| download | linux-deefa7f3505ae2fb6a7cb75f50134b65a1dd1494.tar.bz2 | |
fs: Add receive_fd() wrapper for __receive_fd()
For both pidfd and seccomp, the __user pointer is not used. Update
__receive_fd() to make writing to ufd optional via a NULL check. However,
for the receive_fd_user() wrapper, ufd is NULL checked so an -EFAULT
can be returned to avoid changing the SCM_RIGHTS interface behavior. Add
new wrapper receive_fd() for pidfd and seccomp that does not use the ufd
argument. For the new helper, the allocated fd needs to be returned on
success. Update the existing callers to handle it.
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Reviewed-by: Sargun Dhillon <sargun@sargun.me>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/compat.c | 2 | ||||
| -rw-r--r-- | net/core/scm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/compat.c b/net/compat.c index e74cd3dae8b0..dc7ddbc2b15e 100644 --- a/net/compat.c +++ b/net/compat.c @@ -299,7 +299,7 @@ void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm) for (i = 0; i < fdmax; i++) { err = receive_fd_user(scm->fp->fp[i], cmsg_data + i, o_flags); - if (err) + if (err < 0) break; } diff --git a/net/core/scm.c b/net/core/scm.c index 67c166a7820d..8156d4fb8a39 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -307,7 +307,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) for (i = 0; i < fdmax; i++) { err = receive_fd_user(scm->fp->fp[i], cmsg_data + i, o_flags); - if (err) + if (err < 0) break; } |