Commit f9b4240b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux 

Pull misc fixes from Christian Brauner:
 "This contains several fixes which felt worth being combined into a
  single branch:

   - Use put_nsproxy() instead of open-coding it switch_task_namespaces()

   - Kirill's work to unify lifecycle management for all namespaces. The
     lifetime counters are used identically for all namespaces types.
     Namespaces may of course have additional unrelated counters and
     these are not altered. This work allows us to unify the type of the
     counters and reduces maintenance cost by moving the counter in one
     place and indicating that basic lifetime management is identical
     for all namespaces.

   - Peilin's fix adding three byte padding to Dmitry's
     PTRACE_GET_SYSCALL_INFO uapi struct to prevent an info leak.

   - Two smal patches to convert from the /* fall through */ comment
     annotation to the fallthrough keyword annotation which I had taken
     into my branch and into -next before df561f66 ("treewide: Use
     fallthrough pseudo-keyword") made it upstream which fixed this
     tree-wide.

     Since I didn't want to invalidate all testing for other commits I
     didn't rebase and kept them"

* tag 'fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
  nsproxy: use put_nsproxy() in switch_task_namespaces()
  sys: Convert to the new fallthrough notation
  signal: Convert to the new fallthrough notation
  time: Use generic ns_common::count
  cgroup: Use generic ns_common::count
  mnt: Use generic ns_common::count
  user: Use generic ns_common::count
  pid: Use generic ns_common::count
  ipc: Use generic ns_common::count
  uts: Use generic ns_common::count
  net: Use generic ns_common::count
  ns: Add a common refcount into ns_common
  ptrace: Prevent kernel-infoleak in ptrace_get_syscall_info()
parents 6d93a197 aabe19b8

fs/mount.h

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <linux/fs_pin.h>



struct mnt_namespace {

	atomic_t		count;

	struct ns_common	ns;

	struct mount *	root;

	/*
@@ -120,7 +119,7 @@ static inline void detach_mounts(struct dentry *dentry) 


static inline void get_mnt_ns(struct mnt_namespace *ns)

{

	atomic_inc(&ns->count);

	refcount_inc(&ns->ns.count);

}



extern seqlock_t mount_lock;

fs/namespace.c

+2 −2
Original line number Diff line number Diff line
@@ -3274,7 +3274,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns, bool a 
	new_ns->ns.ops = &mntns_operations;

	if (!anon)

		new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);

	atomic_set(&new_ns->count, 1);

	refcount_set(&new_ns->ns.count, 1);

	INIT_LIST_HEAD(&new_ns->list);

	init_waitqueue_head(&new_ns->poll);

	spin_lock_init(&new_ns->ns_lock);
@@ -3848,7 +3848,7 @@ void __init mnt_init(void) 


void put_mnt_ns(struct mnt_namespace *ns)

{

	if (!atomic_dec_and_test(&ns->count))

	if (!refcount_dec_and_test(&ns->ns.count))

		return;

	drop_collected_mounts(&ns->root->mnt);

	free_mnt_ns(ns);

include/linux/cgroup.h

+2 −3
Original line number Diff line number Diff line
@@ -854,7 +854,6 @@ static inline void cgroup_sk_free(struct sock_cgroup_data *skcd) {} 
#endif	/* CONFIG_CGROUP_DATA */



struct cgroup_namespace {

	refcount_t		count;

	struct ns_common	ns;

	struct user_namespace	*user_ns;

	struct ucounts		*ucounts;
@@ -889,12 +888,12 @@ copy_cgroup_ns(unsigned long flags, struct user_namespace *user_ns, 
static inline void get_cgroup_ns(struct cgroup_namespace *ns)

{

	if (ns)

		refcount_inc(&ns->count);

		refcount_inc(&ns->ns.count);

}



static inline void put_cgroup_ns(struct cgroup_namespace *ns)

{

	if (ns && refcount_dec_and_test(&ns->count))

	if (ns && refcount_dec_and_test(&ns->ns.count))

		free_cgroup_ns(ns);

}

include/linux/ipc_namespace.h

+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ struct ipc_ids { 
};



struct ipc_namespace {

	refcount_t	count;

	struct ipc_ids	ids[3];



	int		sem_ctls[4];
@@ -128,7 +127,7 @@ extern struct ipc_namespace *copy_ipcs(unsigned long flags, 
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)

{

	if (ns)

		refcount_inc(&ns->count);

		refcount_inc(&ns->ns.count);

	return ns;

}

include/linux/ns_common.h

+3 −0
Original line number Diff line number Diff line
@@ -2,12 +2,15 @@ 
#ifndef _LINUX_NS_COMMON_H

#define _LINUX_NS_COMMON_H



#include <linux/refcount.h>



struct proc_ns_operations;



struct ns_common {

	atomic_long_t stashed;

	const struct proc_ns_operations *ops;

	unsigned int inum;

	refcount_t count;

};



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE