Linus Torvalds 0ef3a56b1c Merge branch 'CVE-2014-7975' of git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux ... Pull do_umount fix from Andy Lutomirski: "This fix really ought to be safe. Inside a mountns owned by a non-root user namespace, the namespace root almost always has MNT_LOCKED set (if it doesn't, then there's a bug, because rootfs could be exposed). In that case, calling umount on "/" will return -EINVAL with or without this patch. Outside a userns, this patch will have no effect. may_mount, required by umount, already checks ns_capable(current->nsproxy->mnt_ns->user_ns, CAP_SYS_ADMIN) so an additional capable(CAP_SYS_ADMIN) check will have no effect. That leaves anything that calls umount on "/" in a non-root userns while chrooted. This is the case that is currently broken (it remounts ro, which shouldn't be allowed) and that my patch changes to -EPERM. If anything relies on *that*, I'd be surprised" * 'CVE-2014-7975' of git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux: fs: Add a missing permission check to do_umount		2014-10-14 08:35:01 +02:00
..
9p
adfs
affs	fs/affs: remove redundant sys_tz declarations	2014-10-14 02:18:22 +02:00
afs	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 16:23:15 +02:00
autofs4	autofs4: d_manage() should return -EISDIR when appropriate in rcu-walk mode.	2014-10-14 02:18:16 +02:00
befs	fs/befs/btree.c: remove typedef befs_btree_node	2014-10-14 02:18:20 +02:00
bfs
btrfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-10-13 11:28:42 +02:00
cachefiles
ceph
cifs	cifs: replace strnicmp with strncasecmp	2014-10-14 02:18:24 +02:00
coda
configfs
cramfs
debugfs
devpts
dlm
ecryptfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-10-13 11:28:42 +02:00
efivarfs
efs
exofs
exportfs
ext2
ext3
ext4
f2fs
fat	fat: remove redundant sys_tz declaration	2014-10-14 02:18:20 +02:00
freevxfs
fscache
fuse
gfs2	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-10-13 11:28:42 +02:00
hfs	fs/hfs/hfs_fs.h: remove redundant sys_tz declaration	2014-10-14 02:18:20 +02:00
hfsplus
hostfs
hpfs
hppfs
hugetlbfs
isofs	isofs: replace strnicmp with strncasecmp	2014-10-14 02:18:24 +02:00
jbd
jbd2
jffs2
jfs	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 16:23:15 +02:00
kernfs
lockd
logfs
minix
ncpfs	fs/ncpfs/dir.c: remove redundant sys_tz declaration	2014-10-14 02:18:16 +02:00
nfs	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 16:23:15 +02:00
nfs_common
nfsd	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 16:23:15 +02:00
nilfs2	nilfs2: improve the performance of fdatasync()	2014-10-14 02:18:20 +02:00
nls
notify
ntfs
ocfs2	ocfs2: replace strnicmp with strncasecmp	2014-10-14 02:18:24 +02:00
omfs	FS/OMFS: block number sanity check during fill_super operation	2014-10-14 02:18:22 +02:00
openpromfs
proc	mm: softdirty: enable write notifications on VMAs after VM_SOFTDIRTY cleared	2014-10-14 02:18:28 +02:00
pstore
qnx4
qnx6
quota
ramfs
reiserfs	fs/reiserfs/journal.c: fix sparse context imbalance warning	2014-10-14 02:18:20 +02:00
romfs
squashfs
sysfs
sysv
ubifs
udf
ufs	fs/ufs/balloc.c: remove unused variable	2014-10-14 02:18:20 +02:00
xfs	Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next	2014-10-13 10:22:45 +11:00
aio.c
anon_inodes.c
attr.c
bad_inode.c
binfmt_aout.c
binfmt_elf_fdpic.c
binfmt_elf.c
binfmt_em86.c
binfmt_flat.c
binfmt_misc.c	binfmt_misc: work around gcc-4.9 warning	2014-10-14 02:18:16 +02:00
binfmt_script.c
binfmt_som.c
block_dev.c
buffer.c	fs: check bh blocknr earlier when searching lru	2014-10-14 02:18:26 +02:00
char_dev.c
compat_binfmt_elf.c
compat_ioctl.c
compat.c
coredump.c	coredump: add %i/%I in core_pattern to report the tid of the crashed thread	2014-10-14 02:18:21 +02:00
dcache.c	take dname_external() into fs/dcache.c	2014-10-12 17:09:05 -04:00
dcookies.c
direct-io.c
drop_caches.c
eventfd.c
eventpoll.c
exec.c
fcntl.c
fhandle.c
file_table.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-10-13 11:28:42 +02:00
file.c	Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 15:44:12 +02:00
filesystems.c
fs_pin.c
fs_struct.c
fs-writeback.c
inode.c
internal.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-10-13 11:28:42 +02:00
ioctl.c
Kconfig
Kconfig.binfmt
libfs.c
locks.c
Makefile
mbcache.c
mount.h
mpage.c
namei.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-10-13 11:28:42 +02:00
namespace.c	Merge branch 'CVE-2014-7975' of git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux	2014-10-14 08:35:01 +02:00
no-block.c
open.c
pipe.c
pnode.c
pnode.h
posix_acl.c
proc_namespace.c
read_write.c
readdir.c
select.c
seq_file.c
signalfd.c
splice.c
stack.c
stat.c
statfs.c
super.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-10-13 11:28:42 +02:00
sync.c
timerfd.c
utimes.c
xattr.c	vfs: Deduplicate code shared by xattr system calls operating on paths	2014-10-12 17:09:10 -04:00