[PATCH v7 2/9] pidfd: Add missing sock updates for pidfd_getfd()
flat view
STALE2253d
From: Kees Cook <hidden>
Date: 2020-07-09 18:26:50
Also in:
linux-api, linux-fsdevel, linux-kselftest, lkml, stable
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v7 of 4 in this series.
Revisions (4)
- v4 [diff vs current]
- v5 [diff vs current]
- v6 [diff vs current]
- v7 current
The sock counting (sock_update_netprioidx() and sock_update_classid())
was missing from pidfd's implementation of received fd installation. Add
a call to the new __receive_sock() helper.
Cc: stable@vger.kernel.org
Fixes: 8649c322f75c ("pid: Implement pidfd_getfd syscall")
Signed-off-by: Kees Cook <redacted>
---
kernel/pid.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/kernel/pid.c b/kernel/pid.c
index f1496b757162..85ed00abdc7c 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c@@ -42,6 +42,7 @@ #include <linux/sched/signal.h> #include <linux/sched/task.h> #include <linux/idr.h> +#include <net/sock.h> struct pid init_struct_pid = { .count = REFCOUNT_INIT(1),
@@ -642,10 +643,12 @@ static int pidfd_getfd(struct pid *pid, int fd) } ret = get_unused_fd_flags(O_CLOEXEC); - if (ret < 0) + if (ret < 0) { fput(file); - else + } else { fd_install(ret, file); + __receive_sock(file); + } return ret; }
--
2.25.1