Linus Torvalds
0cbee99269
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace ...
Pull user namespace updates from Eric Biederman:
"Long ago and far away when user namespaces where young it was realized
that allowing fresh mounts of proc and sysfs with only user namespace
permissions could violate the basic rule that only root gets to decide
if proc or sysfs should be mounted at all.
Some hacks were put in place to reduce the worst of the damage could
be done, and the common sense rule was adopted that fresh mounts of
proc and sysfs should allow no more than bind mounts of proc and
sysfs. Unfortunately that rule has not been fully enforced.
There are two kinds of gaps in that enforcement. Only filesystems
mounted on empty directories of proc and sysfs should be ignored but
the test for empty directories was insufficient. So in my tree
directories on proc, sysctl and sysfs that will always be empty are
created specially. Every other technique is imperfect as an ordinary
directory can have entries added even after a readdir returns and
shows that the directory is empty. Special creation of directories
for mount points makes the code in the kernel a smidge clearer about
it's purpose. I asked container developers from the various container
projects to help test this and no holes were found in the set of mount
points on proc and sysfs that are created specially.
This set of changes also starts enforcing the mount flags of fresh
mounts of proc and sysfs are consistent with the existing mount of
proc and sysfs. I expected this to be the boring part of the work but
unfortunately unprivileged userspace winds up mounting fresh copies of
proc and sysfs with noexec and nosuid clear when root set those flags
on the previous mount of proc and sysfs. So for now only the atime,
read-only and nodev attributes which userspace happens to keep
consistent are enforced. Dealing with the noexec and nosuid
attributes remains for another time.
This set of changes also addresses an issue with how open file
descriptors from /proc/<pid>/ns/* are displayed. Recently readlink of
/proc/<pid>/fd has been triggering a WARN_ON that has not been
meaningful since it was added (as all of the code in the kernel was
converted) and is not now actively wrong.
There is also a short list of issues that have not been fixed yet that
I will mention briefly.
It is possible to rename a directory from below to above a bind mount.
At which point any directory pointers below the renamed directory can
be walked up to the root directory of the filesystem. With user
namespaces enabled a bind mount of the bind mount can be created
allowing the user to pick a directory whose children they can rename
to outside of the bind mount. This is challenging to fix and doubly
so because all obvious solutions must touch code that is in the
performance part of pathname resolution.
As mentioned above there is also a question of how to ensure that
developers by accident or with purpose do not introduce exectuable
files on sysfs and proc and in doing so introduce security regressions
in the current userspace that will not be immediately obvious and as
such are likely to require breaking userspace in painful ways once
they are recognized"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
vfs: Remove incorrect debugging WARN in prepend_path
mnt: Update fs_fully_visible to test for permanently empty directories
sysfs: Create mountpoints with sysfs_create_mount_point
sysfs: Add support for permanently empty directories to serve as mount points.
kernfs: Add support for always empty directories.
proc: Allow creating permanently empty directories that serve as mount points
sysctl: Allow creating permanently empty directories that serve as mountpoints.
fs: Add helper functions for permanently empty directories.
vfs: Ignore unlocked mounts in fs_fully_visible
mnt: Modify fs_fully_visible to deal with locked ro nodev and atime
mnt: Refactor the logic for mounting sysfs and proc in a user namespace
2015-07-03 15:20:57 -07:00
bcma: make calls to PCI hostmode functions config-safe
2015-06-08 14:33:26 +03:00
ceph: pre-allocate data structure that tracks caps flushing
2015-06-25 11:49:31 +03:00
crush: sync up with userspace
2015-06-25 11:49:31 +03:00
fsl /bestcomm
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2015-07-01 19:09:11 -07:00
mfd: twl4030-power: Fix pmic for boards that need AC charger disabled
2015-06-22 12:25:04 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-06-27 12:44:34 -07:00
Char/Misc driver patches for 4.2-rc1
2015-06-26 14:51:15 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
mmc: mediatek: Add Mediatek MMC driver
2015-06-18 09:20:48 +02:00
netfilter: xtables: fix warnings on 32bit platforms
2015-06-18 21:14:33 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-06-23 14:08:54 -07:00
- remoteproc fixes/cleanups from Suman Anna
2015-07-03 14:57:50 -07:00
Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', 'regulator/topic/qcom' and 'regulator/topic/soft-start' into regulator-next
2015-06-22 11:19:56 +01:00
timer: Reduce timer migration overhead if disabled
2015-06-19 15:18:28 +02:00
MIPS: BCM47xx: Extract info about et2 interface
2015-06-21 21:52:24 +02:00
NFS client updates for Linux 4.2
2015-07-02 11:32:23 -07:00
Power management and ACPI fixes for v4.2-rc1
2015-07-01 14:17:44 -07:00
writeback: don't embed root bdi_writeback_congested in bdi_writeback
2015-07-02 08:46:00 -06:00
writeback: don't embed root bdi_writeback_congested in bdi_writeback
2015-07-02 08:46:00 -06:00
backlight: Change the return type of backlight_update_status() to int
2015-06-23 15:47:35 +01:00
MIPS: BCM47xx: Move NVRAM driver to the drivers/firmware/
2015-06-21 21:55:33 +02:00
Merge branch 'for-4.2/writeback' of git://git.kernel.dk/linux-block
2015-06-25 16:00:17 -07:00
Revert "block, dm: don't copy bios for request clones"
2015-06-26 10:11:58 -04:00
- Revert block and DM core changes the removed request-based DM's
2015-06-26 12:35:01 -07:00
mm: only define hashdist variable when needed
2015-06-24 17:49:41 -07:00
bpf: allow networking programs to use bpf_trace_printk() for debugging
2015-06-15 15:53:50 -07:00
net: phy: broadcom: define Broadcom pseudo-PHY address in brcmphy.h
2015-06-10 23:33:58 -07:00
cgroup: require write perm on common ancestor when moving processes on the default hierarchy
2015-06-18 16:54:28 -04:00
Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2015-06-26 19:50:04 -07:00
clk: tegra: Changes for v4.2-rc1
2015-06-20 13:29:48 -07:00
compiler-gcc: integrate the various compiler-gcc[345].h files
2015-06-25 17:00:38 -07:00
compiler-intel: fix wrong compiler barrier() macro
2015-06-25 17:00:38 -07:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
configfs: unexport/make static config_item_init()
2015-06-24 17:49:39 -07:00
printk: implement support for extended console drivers
2015-06-25 17:00:38 -07:00
Merge branches 'pm-sleep' and 'pm-runtime'
2015-06-19 01:18:02 +02:00
crypto: algif_aead - Temporarily disable all AEAD algorithms
2015-06-22 15:49:30 +08:00
Replace module_platform_driver with builtin_platform driver in non modules.
2015-07-02 10:42:13 -07:00
Merge branch 'topic/xdmac' into for-linus
2015-06-25 09:21:49 +05:30
iommu: dmar: Provide helper to copy shared irte fields
2015-06-12 11:33:52 +02:00
firmware: dmi: struct dmi_header should be packed
2015-06-25 09:06:57 +02:00
The libnvdimm sub-system introduces, in addition to the libnvdimm-core,
2015-06-29 10:34:42 -07:00
cfq-iosched: fix the setting of IOPS mode on SSDs
2015-06-10 08:01:20 -06:00
extcon: Redefine the unique id of supported external connectors without 'enum extcon' type
2015-06-12 17:01:42 -07:00
frontswap: allow multiple backends
2015-06-24 17:49:45 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2015-07-03 15:20:57 -07:00
fsnotify: remove obsolete documentation
2015-06-24 17:49:38 -07:00
genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()
2015-06-30 19:45:01 -07:00
mm: meminit: finish initialisation of struct pages before basic setup
2015-06-30 19:44:56 -07:00
timer: Minimize nohz off overhead
2015-06-19 15:18:28 +02:00
net/core: Add reading VF statistics through the PF netdevice
2015-06-15 17:23:03 -07:00
macvtap: Increase limit of macvtap queues
2015-06-23 06:14:04 -07:00
sock_diag: specify info_size per inet protocol
2015-06-15 19:49:22 -07:00
net: ipv4 sysctl option to ignore routes when nexthop link is down
2015-06-24 02:15:54 -07:00
init: delete the __cpuinit related stubs
2015-06-16 14:12:23 -04:00
Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2015-06-26 19:50:04 -07:00
IOMMU Updates for Linux v4.2
2015-06-23 18:27:19 -07:00
x86/mm: Decouple <linux/vmalloc.h> from <asm/io.h>
2015-06-03 12:02:00 +02:00
iommu: Introduce iommu_request_dm_for_dev()
2015-06-11 09:01:55 +02:00
genirq: Clean up outdated comments related to include/linux/irqdesc.h
2015-06-25 12:06:34 +02:00
genirq: Implement irq_set_handler_locked()/irq_set_chip_handler_name_locked()
2015-06-26 21:32:30 +02:00
genirq: Remove irq_node()
2015-06-25 12:06:45 +02:00
jbd2: fix ocfs2 corrupt when updating journal superblock fails
2015-06-15 14:36:01 -04:00
time: Allow gcc to fold usecs_to_jiffies(constant)
2015-06-10 11:31:14 +02:00
Merge branch 'akpm' (patches from Andrew)
2015-07-01 17:47:51 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2015-07-03 15:20:57 -07:00
mm: kmemleak_alloc_percpu() should follow the gfp from per_alloc()
2015-06-24 17:49:46 -07:00
KVM: implement multiple address spaces
2015-06-05 17:26:35 +02:00
sched/stop_machine: Fix deadlock between multiple stop_two_cpus()
2015-06-19 10:03:12 +02:00
Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2015-06-25 16:49:21 -07:00
libnvdimm: Add sysfs numa_node to NVDIMM devices
2015-06-26 11:23:38 -04:00
Merge branch 'sched-hrtimers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-06-24 15:09:40 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2015-06-27 13:26:03 -07:00
mailbox: Add ability for clients to request channels by name
2015-06-11 22:19:45 +05:30
memblock: introduce a for_each_reserved_mem_region iterator
2015-06-30 19:44:55 -07:00
Merge branch 'for-4.2/writeback' of git://git.kernel.dk/linux-block
2015-06-25 16:00:17 -07:00
mm: new arch_remap() hook
2015-06-24 17:49:41 -07:00
mm: meminit: make __early_pfn_to_nid SMP-safe and introduce meminit_pfn_in_nid
2015-06-30 19:44:56 -07:00
mm: clarify that the function operates on hugepage pte
2015-06-24 17:49:44 -07:00
mm: meminit: initialise a subset of struct pages if CONFIG_DEFERRED_STRUCT_PAGE_INIT is set
2015-06-30 19:44:56 -07:00
USB patches for 4.2-rc1
2015-06-26 15:59:26 -07:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
MPILIB: add mpi_read_buf() and mpi_get_size() helpers
2015-06-16 14:35:06 +08:00
libnvdimm: infrastructure for btt devices
2015-06-25 04:20:04 -04:00
net/core: Add reading VF statistics through the PF netdevice
2015-06-15 17:23:03 -07:00
netfilter: don't pull include/linux/netfilter.h from netns headers
2015-06-18 21:14:31 +02:00
net: ip_fragment: remove BRIDGE_NETFILTER mtu special handling
2015-06-12 14:16:46 +02:00
netfilter: don't pull include/linux/netfilter.h from netns headers
2015-06-18 21:14:31 +02:00
netfilter: bridge: forward IPv6 fragmented packets
2015-06-12 14:10:12 +02:00
NFSv.2/pnfs Add a LAYOUTSTATS rpc function
2015-06-24 10:17:37 -04:00
nfs42: serialize LAYOUTSTATS calls of the same file
2015-06-24 10:53:11 -04:00
NFSv4.2: LAYOUTSTATS is optional to implement
2015-06-27 11:48:58 -04:00
NFS: Remove unused nfs_rw_ops->rw_release() function
2015-06-10 18:32:40 -04:00
NFSv.2/pnfs Add a LAYOUTSTATS rpc function
2015-06-24 10:17:37 -04:00
watchdog: add watchdog_cpumask sysctl to assist nohz
2015-06-24 17:49:40 -07:00
NVMe: Automatic namespace rescan
2015-06-05 10:58:34 -06:00
Devicetree changes for v4.2
2015-07-01 19:40:18 -07:00
Devicetree changes for v4.2
2015-07-01 19:40:18 -07:00
of: fix a build error to of_graph_get_endpoint_by_regs function
2015-06-24 11:18:48 +10:00
mm: oom_kill: simplify OOM killer locking
2015-06-24 17:49:43 -07:00
Merge branches 'pci/aspm', 'pci/enumeration', 'pci/hotplug', 'pci/misc', 'pci/msi', 'pci/resource' and 'pci/virtualization' into next
2015-06-12 15:26:45 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
This patch series contains several clean ups and even a new trace clock
2015-06-26 14:02:43 -07:00
platform_device: better support builtin boilerplate avoidance
2015-06-16 14:12:37 -04:00
Merge branch 'pm-wakeirq'
2015-06-19 01:18:14 +02:00
The libnvdimm sub-system introduces, in addition to the libnvdimm-core,
2015-06-29 10:34:42 -07:00
power: Add devm_power_supply_get_by_phandle() helper function
2015-06-10 16:15:54 +02:00
preempt: Reorganize the notrace definitions a bit
2015-06-07 15:57:43 +02:00
printk: guard the amount written per line by devkmsg_read()
2015-06-25 17:00:38 -07:00
device property: Introduces device_dma_is_coherent()
2015-06-15 14:40:49 +02:00
pwm: Add pwmchip_add_with_polarity() API
2015-06-12 11:36:30 +02:00
spi: pxa2xx: Prepare for new Intel LPSS SPI type
2015-06-05 11:40:45 +01:00
random: Remove kernel blocking API
2015-06-10 19:14:04 +08:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-06-22 18:57:44 -07:00
remoteproc: add a rproc ops for performing address translation
2015-06-17 09:57:12 +03:00
rtc: interface: Remove rtc_set_mmss()
2015-06-25 01:13:43 +02:00
switchdev; add VLAN support for port's bridge_getlink
2015-06-23 06:56:18 -07:00
drivers/scsi/scsi_debug.c: resolve sg buffer const-ness issue
2015-06-30 19:44:59 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2015-06-27 13:26:03 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2015-06-27 13:26:03 -07:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2015-06-15 14:30:32 -07:00
Fix kmalloc slab creation sequence
2015-06-29 10:49:51 -07:00
smpboot: allow excluding cpus from the smpboot threads
2015-06-24 17:49:40 -07:00
sock_diag: define destruction multicast groups
2015-06-15 19:49:22 -07:00
stddef.h: move offsetofend inside #ifndef/#endif guard, neaten
2015-06-25 17:00:38 -07:00
lib/string.c: introduce strreplace()
2015-06-25 17:00:40 -07:00
This patch series contains several clean ups and even a new trace clock
2015-06-26 14:02:43 -07:00
sysctl: Allow creating permanently empty directories that serve as mountpoints.
2015-07-01 10:36:39 -05:00
sysfs: Add support for permanently empty directories to serve as mount points.
2015-07-01 10:36:45 -05:00
check_syslog_permissions() cleanup
2015-06-25 17:00:39 -07:00
Power management and ACPI material for v4.2-rc1
2015-06-23 14:18:07 -07:00
time: Prevent early expiry of hrtimers[CLOCK_REALTIME] at the leap second edge
2015-06-12 11:15:49 +02:00
time: Prevent early expiry of hrtimers[CLOCK_REALTIME] at the leap second edge
2015-06-12 11:15:49 +02:00
timer: Reduce timer migration overhead if disabled
2015-06-19 15:18:28 +02:00
net: make u64_stats_init() a function
2015-06-15 16:02:52 -07:00
vme: export vme_check_window()
2015-06-12 17:26:57 -07:00
md updates for 4.2
2015-06-29 11:10:56 -07:00
watchdog: watchdog_core: Add watchdog registration deferral mechanism
2015-06-29 11:51:06 +02:00
zpool: remove zpool_evict()
2015-06-25 17:00:37 -07:00
