Linus Torvalds
87c31b39ab
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace ...
Pull user namespace related fixes from Eric Biederman:
"As these are bug fixes almost all of thes changes are marked for
backporting to stable.
The first change (implicitly adding MNT_NODEV on remount) addresses a
regression that was created when security issues with unprivileged
remount were closed. I go on to update the remount test to make it
easy to detect if this issue reoccurs.
Then there are a handful of mount and umount related fixes.
Then half of the changes deal with the a recently discovered design
bug in the permission checks of gid_map. Unix since the beginning has
allowed setting group permissions on files to less than the user and
other permissions (aka ---rwx---rwx). As the unix permission checks
stop as soon as a group matches, and setgroups allows setting groups
that can not later be dropped, results in a situtation where it is
possible to legitimately use a group to assign fewer privileges to a
process. Which means dropping a group can increase a processes
privileges.
The fix I have adopted is that gid_map is now no longer writable
without privilege unless the new file /proc/self/setgroups has been
set to permanently disable setgroups.
The bulk of user namespace using applications even the applications
using applications using user namespaces without privilege remain
unaffected by this change. Unfortunately this ix breaks a couple user
space applications, that were relying on the problematic behavior (one
of which was tools/selftests/mount/unprivileged-remount-test.c).
To hopefully prevent needing a regression fix on top of my security
fix I rounded folks who work with the container implementations mostly
like to be affected and encouraged them to test the changes.
> So far nothing broke on my libvirt-lxc test bed. :-)
> Tested with openSUSE 13.2 and libvirt 1.2.9.
> Tested-by: Richard Weinberger <richard@nod.at>
> Tested on Fedora20 with libvirt 1.2.11, works fine.
> Tested-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
> Ok, thanks - yes, unprivileged lxc is working fine with your kernels.
> Just to be sure I was testing the right thing I also tested using
> my unprivileged nsexec testcases, and they failed on setgroup/setgid
> as now expected, and succeeded there without your patches.
> Tested-by: Serge Hallyn <serge.hallyn@ubuntu.com>
> I tested this with Sandstorm. It breaks as is and it works if I add
> the setgroups thing.
> Tested-by: Andy Lutomirski <luto@amacapital.net> # breaks things as designed :("
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
userns: Unbreak the unprivileged remount tests
userns; Correct the comment in map_write
userns: Allow setting gid_maps without privilege when setgroups is disabled
userns: Add a knob to disable setgroups on a per user namespace basis
userns: Rename id_map_mutex to userns_state_mutex
userns: Only allow the creator of the userns unprivileged mappings
userns: Check euid no fsuid when establishing an unprivileged uid mapping
userns: Don't allow unprivileged creation of gid mappings
userns: Don't allow setgroups until a gid mapping has been setablished
userns: Document what the invariant required for safe unprivileged mappings.
groups: Consolidate the setgroups permission checks
mnt: Clear mnt_expire during pivot_root
mnt: Carefully set CL_UNPRIVILEGED in clone_mnt
mnt: Move the clear of MNT_LOCKED from copy_tree to it's callers.
umount: Do not allow unmounting rootfs.
umount: Disallow unprivileged mount force
mnt: Update unprivileged remount test
mnt: Implicitly add MNT_NODEV on remount when it was implicitly added by mount
2014-12-17 12:31:40 -08:00
Char/Misc driver patches for 3.19-rc1
2014-12-14 16:43:47 -08:00
can: dev: Consolidate and unify state change handling
2014-12-07 21:22:09 +01:00
fsl /bestcomm
This is the bulk of GPIO changes for the v3.19 series:
2014-12-14 14:05:05 -08:00
USB patches for 3.19-rc1
2014-12-14 14:57:16 -08:00
Merge 3.18-rc7 into staging-work.
2014-12-02 16:20:59 -08:00
Merge branch 'irq-irqdomain-arm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-15 17:30:09 -08:00
lockd: eliminate LOCKD_DEBUG
2014-11-24 17:24:08 -05:00
sound updates for 3.19-rc1
2014-12-11 13:20:50 -08:00
net/mlx4: Add support for A0 steering
2014-12-11 14:47:36 -05:00
net/mlx5_core: Remove unused dev cap enum fields
2014-12-08 20:45:54 -05:00
mmc: core: Let mmc_send_tuning() to take struct mmc_host* as parameter
2014-12-08 09:11:04 +01:00
mtd: nand: add ATO manufacturer info
2014-11-25 20:11:12 -08:00
phy: remove the old lookup method
2014-11-22 13:58:39 +05:30
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-12-15 15:52:01 -08:00
Merge remote-tracking branches 'regulator/topic/sky81452' and 'regulator/topic/stub' into regulator-next
2014-12-05 11:14:43 +00:00
soc /ti
spi: core: Add spi_transfer_is_last() helper
2014-11-24 18:53:42 +00:00
sunrpc: convert to lockless lookup of queued server threads
2014-12-09 11:22:22 -05:00
USB patches for 3.19-rc1
2014-12-14 14:57:16 -08:00
Merge branch 'pm-runtime'
2014-12-08 20:00:44 +01:00
syscalls: implement execveat() system call
2014-12-13 12:42:51 -08:00
blk: introduce generic io stat accounting help function
2014-11-24 08:04:44 -07:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Merge branch 'for-3.19/core' of git://git.kernel.dk/linux-block
2014-12-13 14:14:23 -08:00
Merge branch 'for-3.19/core' of git://git.kernel.dk/linux-block
2014-12-13 14:14:23 -08:00
net: sock: allow eBPF programs to be attached to sockets
2014-12-05 21:47:32 -08:00
Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2014-12-11 18:57:19 -08:00
mm, compaction: simplify deferred compaction
2014-12-10 17:41:06 -08:00
syscalls: implement execveat() system call
2014-12-13 12:42:51 -08:00
coresight: fixed comments in coresight.h
2014-11-26 19:28:11 -08:00
cpufreq: Introduce ->ready() callback for cpufreq drivers
2014-11-29 23:38:38 +01:00
groups: Consolidate the setgroups permission checks
2014-12-05 17:19:27 -06:00
crypto: prefix module autoloading with "crypto-"
2014-11-24 22:43:57 +08:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
Driver core patches for 3.19-rc1
2014-12-14 16:10:09 -08:00
dma-mapping: detect and configure IOMMU in of_dma_configure
2014-12-01 16:50:45 +00:00
dmaengine: clarify the issue_pending expectations
2014-12-05 20:55:27 +05:30
eeprom-93cx6: Add (read-only) support for 8-bit mode
2014-11-25 15:42:53 +01:00
binfmt_elf: allow arch code to examine PT_LOPROC ... PT_HIPROC headers
2014-11-24 07:45:02 +01:00
net: Add functions for handling padding frame and adding to length
2014-12-08 20:47:41 -05:00
ethtool: Support for configurable RSS hash function
2014-12-08 21:07:10 -05:00
fault-inject: add ratelimit option
2014-12-13 12:42:52 -08:00
include/linux/file.h: remove get_unused_fd() macro
2014-12-10 17:41:10 -08:00
net: sock: allow eBPF programs to be attached to sockets
2014-12-05 21:47:32 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-12-16 15:53:03 -08:00
fsnotify: remove destroy_list from fsnotify_mark
2014-12-13 12:42:53 -08:00
tracing: Add tp_printk cmdline to have tracepoints go to printk()
2014-12-15 10:17:38 -05:00
mm, gfp: escalatedly define GFP_HIGHUSER and GFP_HIGHUSER_MOVABLE
2014-12-13 12:42:48 -08:00
net, lib: kill arch_fast_hash library bits
2014-12-10 15:17:46 -05:00
Merge branches 'for-3.19/hid-report-len', 'for-3.19/i2c-hid', 'for-3.19/lenovo', 'for-3.19/logitech', 'for-3.19/microsoft', 'for-3.19/plantronics', 'for-3.19/rmi', 'for-3.19/sony' and 'for-3.19/wacom' into for-linus
2014-12-12 11:15:33 +01:00
powerpc updates for 3.19
2014-12-11 17:48:14 -08:00
mm: hugetlb_cgroup: convert to lockless page counters
2014-12-10 17:41:04 -08:00
hyperv: Add support for vNIC hot removal
2014-12-08 20:24:11 -05:00
Merge branch 'i2c/for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-12-14 12:54:40 -08:00
bridge: add new brport flag LEARNING_SYNC
2014-12-02 20:01:23 -08:00
vlan: introduce __vlan_insert_tag helper which does not free skb
2014-11-21 14:20:17 -05:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-09 21:21:34 -08:00
linux/interrupt.h: remove the definition of unused tasklet_hi_enable
2014-12-12 15:15:41 -05:00
ARM: SoC/iommu configuration for 3.19
2014-12-16 14:53:01 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-12-16 15:53:03 -08:00
ipmi: Use the proper type for acpi_handle
2014-12-11 15:04:06 -06:00
ipmi: Remove the now unused priority from SMI sender
2014-12-11 15:04:11 -06:00
Merge branch 'irq-irqdomain-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-10 09:01:01 -08:00
irqdomain: Introduce helper function irq_domain_add_hierarchy()
2014-11-23 13:01:46 +01:00
genirq: Split out flow handler typedefs into seperate header file
2014-11-23 13:01:46 +01:00
printk: add and use LOGLEVEL_<level> defines for KERN_<LEVEL> equivalents
2014-12-10 17:41:11 -08:00
TTY/Serial driver patches for 3.19-rc1
2014-12-14 15:23:32 -08:00
include/linux/kmemleak.h: needs slab.h
2014-12-13 12:42:47 -08:00
kvm: fix kvm_is_mmio_pfn() and rename to kvm_is_reserved_pfn()
2014-11-26 14:40:45 +01:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-12-15 18:28:25 -08:00
Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2014-12-11 18:52:37 -08:00
mailbox: add tx_prepare client callback
2014-11-27 12:50:59 +05:30
bus: mvebu-mbus: provide a mechanism to save SDRAM window configuration
2014-11-30 16:40:11 +00:00
memcg: fix possible use-after-free in memcg_kmem_get_cache()
2014-12-13 12:42:49 -08:00
net: phy: micrel: add generic clock-mode-select support
2014-11-21 14:08:56 -05:00
mm: vmscan: invoke slab shrinkers from shrink_zone()
2014-12-13 12:42:48 -08:00
mm/debug-pagealloc: prepare boottime configurable on/off
2014-12-13 12:42:48 -08:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-12-15 15:52:01 -08:00
mm/page_ext: resurrect struct page extending code for debugging
2014-12-13 12:42:48 -08:00
PCI/MSI: Allow an msi_controller to be associated to an irq domain
2014-11-23 17:14:43 +01:00
make nameidata completely opaque outside of fs/namei.c
2014-12-10 21:32:13 -05:00
ipvlan: move the device check function into netdevice.h
2014-12-09 16:10:06 -05:00
nfs: Add DEALLOCATE support
2014-11-25 16:38:32 -05:00
NFS: fix subtle change in COMMIT behavior
2014-11-24 17:00:42 -05:00
nfs: Add DEALLOCATE support
2014-11-25 16:38:32 -05:00
nfs: Add ALLOCATE support
2014-11-25 16:38:32 -05:00
take the targets of /proc/*/ns/* symlinks to separate fs
2014-12-10 21:30:20 -05:00
Devicetree changes for v3.19
2014-12-11 13:06:58 -08:00
iommu: store DT-probed IOMMU data privately
2014-12-05 14:35:52 +00:00
of/reconfig: Add OF_DYNAMIC notifier for platform_bus_type
2014-11-24 22:25:06 +00:00
mailbox/omap: adapt to the new mailbox framework
2014-11-27 12:51:04 +05:30
oom: don't assume that a coredumping thread will exit soon
2014-12-13 12:42:49 -08:00
mm: memcontrol: remove obsolete kmemcg pinning tricks
2014-12-10 17:41:05 -08:00
mm/page_owner: keep track of page owners
2014-12-13 12:42:48 -08:00
mm/page_owner: keep track of page owners
2014-12-13 12:42:48 -08:00
xen: features and fixes for 3.19-rc0
2014-12-11 18:15:33 -08:00
USB patches for 3.19-rc1
2014-12-14 14:57:16 -08:00
percpu: remove __get_cpu_var and __raw_get_cpu_var macros
2014-12-13 12:42:53 -08:00
Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-12-11 18:36:26 -08:00
printk/percpu: Define printk_func when printk is not defined
2014-11-21 11:19:15 -05:00
net: phy: add static data field to struct phy_driver
2014-11-21 14:08:55 -05:00
common object embedded into various struct ....ns
2014-12-04 14:31:00 -05:00
Merge branch 'pm-runtime'
2014-12-08 20:00:44 +01:00
Merge branch 'pm-runtime'
2014-12-08 20:00:44 +01:00
PM / OPP Introduce APIs to remove OPPs
2014-11-29 23:53:20 +01:00
PM: Drop CONFIG_PM_RUNTIME from the driver core
2014-12-04 00:46:58 +01:00
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2014-12-12 15:26:48 -08:00
This code is a fork from the trace-3.19 pull as it needed the trace_seq
2014-12-10 20:35:41 -08:00
take the targets of /proc/*/ns/* symlinks to separate fs
2014-12-10 21:30:20 -05:00
pstore-ram: Allow optional mapping with pgprot_noncached
2014-12-11 13:38:31 -08:00
exit: ptrace: shift "reap dead" code from exit_ptrace() to forget_original_parent()
2014-12-10 17:41:10 -08:00
spi: spi-pxa2xx: SPI support for Intel Quark X1000
2014-11-26 18:07:45 +00:00
ratelimit: add initialization macro
2014-12-13 12:42:52 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-12-12 10:08:06 -08:00
rtc/lib: Provide y2038 safe rtc_tm_to_time()/rtc_time_to_tm() replacement
2014-11-21 12:00:00 -08:00
rtnetlink: delay RTM_DELLINK notification until after ndo_uninit()
2014-12-09 13:36:57 -05:00
syscalls: implement execveat() system call
2014-12-13 12:42:51 -08:00
serial: core: Add big-endian iotype
2014-11-25 17:06:40 -08:00
mm: vmscan: invoke slab shrinkers from shrink_zone()
2014-12-13 12:42:48 -08:00
net: Pull out core bits of __netdev_alloc_skb and add __napi_alloc_skb
2014-12-10 13:31:57 -05:00
memcg: fix possible use-after-free in memcg_kmem_get_cache()
2014-12-13 12:42:49 -08:00
net: introduce helper macro for_each_cmsghdr
2014-12-10 22:41:55 -05:00
spmi: Remove shutdown/suspend/resume kernel-doc
2014-11-26 19:33:57 -08:00
stacktrace: introduce snprint_stack_trace for buffer output
2014-12-13 12:42:48 -08:00
mm: move swp_entry_t definition to include/linux/mm_types.h
2014-12-13 12:42:47 -08:00
mm: page_cgroup: rename file to mm/swap_cgroup.c
2014-12-10 17:41:09 -08:00
syscalls: implement execveat() system call
2014-12-13 12:42:51 -08:00
Merge branch 'for-davem-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-12-10 13:17:23 -05:00
Merge branches 'thermal-core-fix', 'thermal-soc' and 'thermal-int340x' into next
2014-12-13 12:25:19 +08:00
time: Provide y2038 safe mktime() replacement
2014-11-21 11:59:58 -08:00
Merge branch 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-10 10:13:28 -08:00
bury memcpy_toiovec()
2014-12-09 16:29:11 -05:00
USB / PM: Drop CONFIG_PM_RUNTIME from the USB core
2014-12-04 00:51:54 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2014-12-17 12:31:40 -08:00
common object embedded into various struct ....ns
2014-12-04 14:31:00 -05:00
ARM: vexpress: Remove non-DT code
2014-11-28 16:08:16 +01:00
A balloon enhancement, and a minor race-on-module-unload theoretical
2014-12-17 10:37:56 -08:00
virtio: memory access APIs
2014-12-09 12:05:24 +02:00
virtio: allow finalize_features to fail
2014-12-09 16:32:32 +02:00
mm,vmacache: count number of system-wide flushes
2014-12-13 12:42:48 -08:00
vmci: propagate msghdr all way down to __qp_memcpy_from_queue()
2014-12-09 16:28:23 -05:00
