Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66577193 authored by Al Viro's avatar Al Viro
Browse files

make sure that nsproxy_cache is initialized early enough 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1ba10681

include/linux/nsproxy.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new); 
void free_nsproxy(struct nsproxy *ns);

int unshare_nsproxy_namespaces(unsigned long, struct nsproxy **,

	struct fs_struct *);

int __init nsproxy_cache_init(void);



static inline void put_nsproxy(struct nsproxy *ns)

{

kernel/fork.c

+1 −0
Original line number Diff line number Diff line
@@ -1574,6 +1574,7 @@ void __init proc_caches_init(void) 
			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);

	vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);

	mmap_init();

	nsproxy_cache_init();

}



/*

kernel/nsproxy.c

+1 −3
Original line number Diff line number Diff line
@@ -271,10 +271,8 @@ SYSCALL_DEFINE2(setns, int, fd, int, nstype) 
	return err;

}



static int __init nsproxy_cache_init(void)

int __init nsproxy_cache_init(void)

{

	nsproxy_cachep = KMEM_CACHE(nsproxy, SLAB_PANIC);

	return 0;

}
 


module_init(nsproxy_cache_init);