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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace 

Pull namespace bugfixes from Eric Biederman:
 "This is three simple fixes against 3.9-rc1.  I have tested each of
  these fixes and verified they work correctly.

  The userns oops in key_change_session_keyring and the BUG_ON triggered
  by proc_ns_follow_link were found by Dave Jones.

  I am including the enhancement for mount to only trigger requests of
  filesystem modules here instead of delaying this for the 3.10 merge
  window because it is both trivial and the kind of change that tends to
  bit-rot if left untouched for two months."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  proc: Use nd_jump_link in proc_ns_follow_link
  fs: Limit sys_mount to only request filesystem modules (Part 2).
  fs: Limit sys_mount to only request filesystem modules.
  userns: Stop oopsing in key_change_session_keyring
parents 8343bce1 db04dc67

arch/ia64/kernel/perfmon.c

+1 −0
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ static struct file_system_type pfm_fs_type = { 
	.mount    = pfmfs_mount,

	.kill_sb  = kill_anon_super,

};

MODULE_ALIAS_FS("pfmfs");



DEFINE_PER_CPU(unsigned long, pfm_syst_info);

DEFINE_PER_CPU(struct task_struct *, pmu_owner);

arch/powerpc/platforms/cell/spufs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -749,6 +749,7 @@ static struct file_system_type spufs_type = { 
	.mount = spufs_mount,

	.kill_sb = kill_litter_super,

};

MODULE_ALIAS_FS("spufs");



static int __init spufs_init(void)

{

arch/s390/hypfs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ static struct file_system_type hypfs_type = { 
	.mount		= hypfs_mount,

	.kill_sb	= hypfs_kill_super

};

MODULE_ALIAS_FS("s390_hypfs");



static const struct super_operations hypfs_s_ops = {

	.statfs		= simple_statfs,

drivers/firmware/efivars.c

+1 −0
Original line number Diff line number Diff line
@@ -1289,6 +1289,7 @@ static struct file_system_type efivarfs_type = { 
	.mount   = efivarfs_mount,

	.kill_sb = efivarfs_kill_sb,

};

MODULE_ALIAS_FS("efivarfs");



/*

 * Handle negative dentry.

drivers/infiniband/hw/ipath/ipath_fs.c

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ static struct file_system_type ipathfs_fs_type = { 
	.mount =	ipathfs_mount,

	.kill_sb =	ipathfs_kill_super,

};

MODULE_ALIAS_FS("ipathfs");



int __init ipath_init_ipathfs(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE