Linus Torvalds
73b6fa8e49
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace ...
Pull user namespace updates from Eric Biederman:
"This finishes up the changes to ensure proc and sysfs do not start
implementing executable files, as the there are application today that
are only secure because such files do not exist.
It akso fixes a long standing misfeature of /proc/<pid>/mountinfo that
did not show the proper source for files bind mounted from
/proc/<pid>/ns/*.
It also straightens out the handling of clone flags related to user
namespaces, fixing an unnecessary failure of unshare(CLONE_NEWUSER)
when files such as /proc/<pid>/environ are read while <pid> is calling
unshare. This winds up fixing a minor bug in unshare flag handling
that dates back to the first version of unshare in the kernel.
Finally, this fixes a minor regression caused by the introduction of
sysfs_create_mount_point, which broke someone's in house application,
by restoring the size of /sys/fs/cgroup to 0 bytes. Apparently that
application uses the directory size to determine if a tmpfs is mounted
on /sys/fs/cgroup.
The bind mount escape fixes are present in Al Viros for-next branch.
and I expect them to come from there. The bind mount escape is the
last of the user namespace related security bugs that I am aware of"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
fs: Set the size of empty dirs to 0.
userns,pidns: Force thread group sharing, not signal handler sharing.
unshare: Unsharing a thread does not require unsharing a vm
nsfs: Add a show_path method to fix mountinfo
mnt: fs_fully_visible enforce noexec and nosuid if !SB_I_NOEXEC
vfs: Commit to never having exectuables on proc and sysfs.
2015-09-01 16:13:25 -07:00
uart: pl011: Add support to ZTE ZX296702 uart
2015-08-04 22:07:26 -07:00
bcma: make calls to PCI hostmode functions config-safe
2015-06-08 14:33:26 +03:00
can: replace timestamp as unique skb attribute
2015-07-12 21:13:22 +02:00
libceph: enable ceph in a non-default network namespace
2015-07-09 20:30:34 +03:00
ARM: SoC driver updates for v4.3
2015-09-01 13:00:04 -07:00
crush: sync up with userspace
2015-06-25 11:49:31 +03:00
fsl /bestcomm
gpio: Remove double "base" in comment
2015-07-16 00:12:24 +02:00
mfd: twl4030-power: Fix pmic for boards that need AC charger disabled
2015-06-22 12:25:04 +01:00
iio: Add inverse unit conversion macros
2015-08-08 12:50:40 +01:00
Input: improve parsing OF parameters for touchscreens
2015-06-25 14:45:46 -07:00
irqchip/gic: Ensure gic_cpu_if_up/down() programs correct GIC instance
2015-08-04 14:14:06 +02:00
ARM: SoC platform updates for v4.3
2015-09-01 12:18:40 -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
mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
2015-07-07 13:03:25 -07: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
ARM: SoC cleanups for v4.3
2015-09-01 12:10:20 -07:00
Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom-spmi', 'regulator/topic/rk808', 'regulator/topic/stub' and 'regulator/topic/tol' into regulator-next
2015-08-30 14:40:11 +01:00
ARM: prima2: move to use REGMAP APIs for rtciobrg
2015-06-10 15:10:26 +08:00
timer: Reduce timer migration overhead if disabled
2015-06-19 15:18:28 +02:00
ARM: SoC driver updates for v4.3
2015-09-01 13:00:04 -07:00
spi: expose spi_master and spi_device statistics via sysfs
2015-07-07 13:33:23 +01: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
Revert "usb: interface authorization: Introduces the default interface authorization"
2015-08-18 09:58:45 -07:00
Merge branch 'acpi-scan'
2015-07-07 22:48:25 +02:00
Revert "libata: Implement NCQ autosense"
2015-08-03 12:01:54 -04:00
tty/serial: at91: add support to FIFOs
2015-07-23 18:00:42 -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
linux/bitmap: Force inlining of bitmap weight functions
2015-08-05 09:38:08 +02:00
linux/bitmap: Force inlining of bitmap weight functions
2015-08-05 09:38:08 +02:00
blkcg: fix blkcg_policy_data allocation bug
2015-07-09 14:41:11 -06: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
bufferhead: Add _gfp version for sb_getblk()
2015-07-02 01:32:44 -04: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: Constify clk_hw argument to provider APIs
2015-08-24 16:49:11 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
clockevents: Remove clockevents_notify() prototype
2015-07-20 11:37:46 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -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
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm
2015-07-11 20:44:31 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
printk: implement support for extended console drivers
2015-06-25 17:00:38 -07:00
context_tracking: Add ct_state() and CT_WARN_ON()
2015-07-07 10:59:04 +02:00
context_tracking: Add ct_state() and CT_WARN_ON()
2015-07-07 10:59:04 +02:00
coresight: Fix implicit inclusion of linux/sched.h
2015-08-05 13:30:16 -07:00
efi: Handle memory error structures produced based on old versions of standard
2015-07-15 13:30:38 +01:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
cpufeature: correctly annotate the module init function
2015-07-22 09:58:02 +02:00
cpufreq: Avoid attempts to create duplicate symbolic links
2015-07-28 17:19:26 +02:00
Merge branches 'pm-sleep' and 'pm-runtime'
2015-06-19 01:18:02 +02:00
crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag
2015-08-17 16:53:53 +08:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:33:35 -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: Remove optional print_state() function pointer of struct extcon_dev
2015-08-10 11:48:55 +09:00
rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()
2015-07-22 15:27:32 -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-09-01 16:13:25 -07:00
drivers: usb: fsl: Workaround for USB erratum-A005275
2015-08-14 16:50:36 -07:00
fsnotify: remove obsolete documentation
2015-06-24 17:49:38 -07:00
ftrace: Fix breakage of set_ftrace_pid
2015-07-24 13:58:14 -04: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
First set of IIO fixes for the 4.2 cycle.
2015-07-13 14:18:07 -07:00
timer: Minimize nohz off overhead
2015-06-19 15:18:28 +02:00
mm: hugetlb: allow hugepages_supported to be architecture specific
2015-07-17 16:39:52 -07:00
Drivers: hv: vmbus: Further improve CPU affiliation logic
2015-08-05 11:44:28 -07: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
module: relocate module_init from init.h to module.h
2015-07-05 23:59:14 -04:00
sched/cputime: Guarantee stime + utime == rtime
2015-08-03 12:21:21 +02: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
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:33:35 -07:00
irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h
2015-07-02 22:34:38 +02:00
genirq: Provide irq_desc_has_action
2015-08-06 00:14:59 +02:00
genirq: Add DOMAIN_BUS_NEXUS irqdomain property
2015-07-30 00:14:38 +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
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:04:50 -07:00
x86/kasan, mm: Introduce generic kasan_populate_zero_shadow()
2015-08-22 14:54:55 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -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
kexec: define kexec_in_progress in !CONFIG_KEXEC case
2015-08-04 22:25:28 -07:00
mm: kmemleak_alloc_percpu() should follow the gfp from per_alloc()
2015-06-24 17:49:46 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
perf/x86/hw_breakpoints: Disallow kernel breakpoints unless kprobe-safe
2015-08-04 10:16:54 +02:00
sched: Fix a race between __kthread_bind() and sched_setaffinity()
2015-08-12 12:06:09 +02:00
KVM: document memory barriers for kvm->vcpus/kvm->online_vcpus
2015-07-30 16:02:54 +02:00
sched/stop_machine: Fix deadlock between multiple stop_two_cpus()
2015-06-19 10:03:12 +02:00
libata: add ATA_HORKAGE_MAX_SEC_1024 to revert back to previous max_sectors limit
2015-07-15 11:47:24 -04: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
mei: bus: add and call callback on notify event
2015-08-03 17:30:00 -07:00
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
char: make misc_deregister a void function
2015-08-05 10:35:49 -07:00
mm: new arch_remap() hook
2015-06-24 17:49:41 -07:00
mm: make page pfmemalloc check more robust
2015-08-21 14:30:10 -07:00
mm: make page pfmemalloc check more robust
2015-08-21 14:30:10 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -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
ACPI / scan: Add support for ACPI _CLS device matching
2015-07-07 01:55:20 +02:00
module: relocate module_init from init.h to module.h
2015-07-05 23:59:14 -04: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
PCI/MSI: Drop domain field from msi_controller
2015-07-30 00:14:39 +02: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
NFS: nfs_mark_for_revalidate should always set NFS_INO_REVAL_PAGECACHE
2015-07-22 17:15:54 -04:00
NFS: Remove the "NFS_CAP_CHANGE_ATTR" capability
2015-07-22 17:15:54 -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
NTB: Add NTB hardware abstraction layer
2015-07-04 14:04:44 -04:00
NTB: Split ntb_hw_intel and ntb_transport drivers
2015-07-04 14:05:49 -04:00
NVMe: Automatic namespace rescan
2015-06-05 10:58:34 -06:00
nvmem: Add nvmem_device based consumer apis.
2015-08-05 13:43:44 -07:00
nvmem: Add a simple NVMEM framework for nvmem providers
2015-08-05 13:43:12 -07:00
Devicetree changes for v4.2
2015-07-01 19:40:18 -07:00
of: constify drv arg of of_driver_match_device stub
2015-07-27 08:23:27 -05: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
of/platform: Assign MSI domain to platform device
2015-07-30 00:14:37 +02:00
mm: oom_kill: simplify OOM killer locking
2015-06-24 17:49:43 -07:00
mm: check __PG_HWPOISON separately from PAGE_FLAGS_CHECK_AT_*
2015-08-07 04:39:42 +03:00
mm/page_owner: set correct gfp_mask on page_owner
2015-07-17 16:39:54 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-07-04 19:36:06 -07:00
Update Viresh Kumar's email address
2015-07-17 16:39:53 -07:00
PCI: Move ATS declarations to linux/pci.h so they're all together
2015-08-13 15:59:58 -05:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:33:35 -07: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
sched/preempt: Fix cond_resched_lock() and cond_resched_softirq()
2015-08-03 12:21:24 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -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: Add support for Intel Sunrisepoint
2015-07-31 19:13:33 +01:00
random: Remove kernel blocking API
2015-06-10 19:14:04 +08:00
rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()
2015-07-22 15:27:32 -07:00
rcu: Add RCU-sched flavors of get-state and cond-sync
2015-07-22 15:26:58 -07:00
rcu: Add RCU-sched flavors of get-state and cond-sync
2015-07-22 15:26:58 -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 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-08-31 20:26:22 -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
vfs: add seq_file_path() helper
2015-06-23 18:01:07 -04:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
tty/early: make serial8250_early_{in,out} static again
2015-07-23 17:43:30 -07:00
mm: make page pfmemalloc check more robust
2015-08-21 14:30:10 -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
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 08:40:25 -07:00
stddef.h: move offsetofend inside #ifndef/#endif guard, neaten
2015-06-25 17:00:38 -07:00
stop_machine: Use 'cpu_stop_fn_t' where possible
2015-08-03 12:21:27 +02: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
Revert "ti-st: add device tree support"
2015-08-05 13:24:12 -07:00
nohz: Remove useless argument on tick_nohz_task_switch()
2015-07-29 15:45:01 +02:00
time: Introduce struct itimerspec64
2015-08-17 11:25:28 -07:00
time: Prevent early expiry of hrtimers[CLOCK_REALTIME] at the leap second edge
2015-06-12 11:15:49 +02:00
Merge branch 'fortglx/4.3/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
2015-08-20 21:13:22 +02:00
timer: Reduce timer migration overhead if disabled
2015-06-19 15:18:28 +02:00
tracing, perf: Implement BPF programs attached to uprobes
2015-08-06 15:29:14 -03:00
tty: core: Add tty_debug() for printk(KERN_DEBUG) messages
2015-07-23 18:37:31 -07:00
Avoid usb reset crashes by making tty_io cdevs truly dynamic
2015-08-03 15:24:43 -07:00
rcu: Create a synchronize_rcu_mult()
2015-07-22 15:27:29 -07:00
net: make u64_stats_init() a function
2015-06-15 16:02:52 -07:00
uprobes/x86: Make arch_uretprobe_is_alive(RP_CHECK_CALL) more clever
2015-07-31 10:38:06 +02:00
Revert "usb: interface authorization: Declare authorized attribute"
2015-08-18 09:59:12 -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
