mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-22 23:04:43 +00:00
pidns: Capture the user namespace and filter ns_last_pid
- Capture the the user namespace that creates the pid namespace - Use that user namespace to test if it is ok to write to /proc/sys/kernel/ns_last_pid. Zhao Hongjiang <zhaohongjiang@huawei.com> noticed I was missing a put_user_ns in when destroying a pid_ns. I have foloded his patch into this one so that bisects will work properly. Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
parent
ae06c7c83f
commit
49f4d8b93c
4 changed files with 19 additions and 9 deletions
|
@ -31,6 +31,7 @@ struct pid_namespace {
|
|||
#ifdef CONFIG_BSD_PROCESS_ACCT
|
||||
struct bsd_acct_struct *bacct;
|
||||
#endif
|
||||
struct user_namespace *user_ns;
|
||||
kgid_t pid_gid;
|
||||
int hide_pid;
|
||||
int reboot; /* group exit code if this pidns was rebooted */
|
||||
|
@ -46,7 +47,8 @@ static inline struct pid_namespace *get_pid_ns(struct pid_namespace *ns)
|
|||
return ns;
|
||||
}
|
||||
|
||||
extern struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *ns);
|
||||
extern struct pid_namespace *copy_pid_ns(unsigned long flags,
|
||||
struct user_namespace *user_ns, struct pid_namespace *ns);
|
||||
extern void zap_pid_ns_processes(struct pid_namespace *pid_ns);
|
||||
extern int reboot_pid_ns(struct pid_namespace *pid_ns, int cmd);
|
||||
extern void put_pid_ns(struct pid_namespace *ns);
|
||||
|
@ -59,8 +61,8 @@ static inline struct pid_namespace *get_pid_ns(struct pid_namespace *ns)
|
|||
return ns;
|
||||
}
|
||||
|
||||
static inline struct pid_namespace *
|
||||
copy_pid_ns(unsigned long flags, struct pid_namespace *ns)
|
||||
static inline struct pid_namespace *copy_pid_ns(unsigned long flags,
|
||||
struct user_namespace *user_ns, struct pid_namespace *ns)
|
||||
{
|
||||
if (flags & CLONE_NEWPID)
|
||||
ns = ERR_PTR(-EINVAL);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue