Linus Torvalds
437589a74b
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace ...
Pull user namespace changes from Eric Biederman:
"This is a mostly modest set of changes to enable basic user namespace
support. This allows the code to code to compile with user namespaces
enabled and removes the assumption there is only the initial user
namespace. Everything is converted except for the most complex of the
filesystems: autofs4, 9p, afs, ceph, cifs, coda, fuse, gfs2, ncpfs,
nfs, ocfs2 and xfs as those patches need a bit more review.
The strategy is to push kuid_t and kgid_t values are far down into
subsystems and filesystems as reasonable. Leaving the make_kuid and
from_kuid operations to happen at the edge of userspace, as the values
come off the disk, and as the values come in from the network.
Letting compile type incompatible compile errors (present when user
namespaces are enabled) guide me to find the issues.
The most tricky areas have been the places where we had an implicit
union of uid and gid values and were storing them in an unsigned int.
Those places were converted into explicit unions. I made certain to
handle those places with simple trivial patches.
Out of that work I discovered we have generic interfaces for storing
quota by projid. I had never heard of the project identifiers before.
Adding full user namespace support for project identifiers accounts
for most of the code size growth in my git tree.
Ultimately there will be work to relax privlige checks from
"capable(FOO)" to "ns_capable(user_ns, FOO)" where it is safe allowing
root in a user names to do those things that today we only forbid to
non-root users because it will confuse suid root applications.
While I was pushing kuid_t and kgid_t changes deep into the audit code
I made a few other cleanups. I capitalized on the fact we process
netlink messages in the context of the message sender. I removed
usage of NETLINK_CRED, and started directly using current->tty.
Some of these patches have also made it into maintainer trees, with no
problems from identical code from different trees showing up in
linux-next.
After reading through all of this code I feel like I might be able to
win a game of kernel trivial pursuit."
Fix up some fairly trivial conflicts in netfilter uid/git logging code.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (107 commits)
userns: Convert the ufs filesystem to use kuid/kgid where appropriate
userns: Convert the udf filesystem to use kuid/kgid where appropriate
userns: Convert ubifs to use kuid/kgid
userns: Convert squashfs to use kuid/kgid where appropriate
userns: Convert reiserfs to use kuid and kgid where appropriate
userns: Convert jfs to use kuid/kgid where appropriate
userns: Convert jffs2 to use kuid and kgid where appropriate
userns: Convert hpfs to use kuid and kgid where appropriate
userns: Convert btrfs to use kuid/kgid where appropriate
userns: Convert bfs to use kuid/kgid where appropriate
userns: Convert affs to use kuid/kgid wherwe appropriate
userns: On alpha modify linux_to_osf_stat to use convert from kuids and kgids
userns: On ia64 deal with current_uid and current_gid being kuid and kgid
userns: On ppc convert current_uid from a kuid before printing.
userns: Convert s390 getting uid and gid system calls to use kuid and kgid
userns: Convert s390 hypfs to use kuid and kgid where appropriate
userns: Convert binder ipc to use kuids
userns: Teach security_path_chown to take kuids and kgids
userns: Add user namespace support to IMA
userns: Convert EVM to deal with kuids and kgids in it's hmac computation
...
2012-10-02 11:11:09 -07:00
serial: pl011: delete reset callback
2012-09-10 16:33:02 -07:00
bcma: BCM43228 support
2012-08-02 13:51:46 -04:00
libceph: clean up con flags
2012-07-30 18:16:01 -07:00
ARM: bcm2835: add stub clock driver
2012-09-19 19:08:53 -06:00
libceph: support crush tunables
2012-07-30 18:15:23 -07:00
extcon: adc_jack: adc-jack driver to support 3.5 pi or simliar devices
2012-09-05 12:20:49 -07:00
ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end
2012-09-12 18:06:30 -07:00
iio:inkern: Add function to read the processed value
2012-09-17 21:48:51 +01:00
Input: MT - Get slot by key
2012-09-19 19:50:19 +02:00
ARM: bcm2835: add interrupt controller driver
2012-09-19 19:08:37 -06:00
LockD: pass actual network namespace to grace period management functions
2012-07-27 16:49:22 -04:00
ARM: soc: device tree updates
2012-10-01 18:28:06 -07:00
net/mlx4_core: Add security check / enforcement for flow steering rules set for VMs
2012-09-07 12:55:59 -04:00
mmc: card: Skip secure erase on MoviNAND; causes unrecoverable corruption.
2012-09-04 13:58:10 -04:00
netfilter: nf_ct_sip: fix IPv6 address parsing
2012-08-10 11:53:11 +02:00
nfsd: Push mnt_want_write() outside of i_mutex
2012-07-31 01:02:51 +04:00
pinctrl: header: trivial: declare struct device
2012-08-17 11:09:58 +02:00
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
ARM: soc: general cleanups
2012-10-01 18:19:05 -07:00
Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next
2012-09-28 14:45:07 +01:00
SUNRPC: Fix a UDP transport regression
2012-09-07 11:43:49 -04:00
USB: EHCI: Tegra: Fix wrong register definition
2012-09-18 17:40:56 +01:00
Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next
2012-09-24 16:36:10 -06:00
include/linux/aio.h: cpp->C conversions
2012-07-30 17:25:21 -07:00
ASoC: atmel-ssc: include linux/io.h for raw io
2012-08-28 10:14:01 -07:00
misc/atmel_tc: make atmel_tc.tcb_config member point to const data
2012-09-11 08:56:37 +02:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
vfs: kill write_super and sync_supers
2012-08-04 01:24:44 +04:00
usb/core: use bin2bcd() for bcdDevice in RH
2012-09-10 11:13:16 -07:00
ARM: bcm2835: add system timer
2012-09-19 19:08:46 -06:00
mm: add get_kernel_page[s] for pinning of kernel addresses for I/O
2012-07-31 18:42:47 -07:00
block: disable discard request merge temporarily
2012-08-09 15:20:23 +02:00
block: add partition resize function to blkpg ioctl
2012-08-01 12:24:18 +02:00
canfd: remove redundant CAN FD flag
2012-08-07 10:10:57 +02:00
Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2012-10-02 10:52:28 -07:00
cgroup: Wrap subsystem selection macro
2012-09-14 09:57:37 -07:00
clk: add of_clk_src_onecell_get() support
2012-09-07 18:30:19 -07:00
clk: add non CONFIG_HAVE_CLK routines
2012-07-30 17:25:11 -07:00
mm: compaction: Abort async compaction if locks are contended or taking too long
2012-08-21 16:45:03 -07:00
ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
2012-07-30 17:25:21 -07:00
compiler.h: add __visible
2012-09-17 15:00:38 -07:00
compiler.h: add __visible
2012-09-17 15:00:38 -07:00
ARM: omap: allow building omap44xx without SMP
2012-08-23 17:16:42 +02:00
cpumask: cpulist_parse() comments correction
2012-07-27 09:29:42 +09:30
vfs: dcache: use DCACHE_DENTRY_KILLED instead of DCACHE_DISCONNECTED in d_kill()
2012-09-18 11:23:51 -07:00
dm thin: commit before gathering status
2012-07-27 15:08:16 +01:00
device.h: Add missing inline to #ifndef CONFIG_PRINTK dev_vprintk_emit
2012-09-26 13:56:59 -07:00
dm thin: commit before gathering status
2012-07-27 15:08:16 +01:00
common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute
2012-07-30 12:25:47 +02:00
common: dma-mapping: introduce dma_get_sgtable() function
2012-07-30 12:25:46 +02:00
efi: Fix the ACPI BGRT driver for images located in EFI boot services memory
2012-09-29 12:21:03 -07:00
efi: Fix the ACPI BGRT driver for images located in EFI boot services memory
2012-09-29 12:21:03 -07:00
Linux support for the 64-bit ARM architecture (AArch64)
2012-10-01 11:51:57 -07:00
extcon: fixing typos
2012-09-05 12:18:11 -07:00
- Small fixes and optimizations.
2012-07-30 09:32:39 -07:00
firmware loader: introduce cache_firmware and uncache_firmware
2012-08-16 13:24:21 -07:00
vfs: kill write_super and sync_supers
2012-08-04 01:24:44 +04:00
powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY
2012-09-24 13:42:45 -07:00
ftrace: Make ftrace_location() a nop on !DYNAMIC_FTRACE
2012-07-31 10:29:57 -04:00
perf/trace: Add ability to set a target task for events
2012-07-31 17:02:05 +02:00
Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block
2012-08-01 09:02:41 -07:00
netvm: allow skb allocation to use PFMEMALLOC reserves
2012-07-31 18:42:46 -07:00
cputime: Use a proper subsystem naming for vtime related APIs
2012-09-25 15:31:31 +02:00
HID: sensors: introduce sensor framework
2012-09-06 19:13:13 +01:00
HID: sensors: introduce sensor framework
2012-09-06 19:13:13 +01:00
HID: Allow more fields in the hid report
2012-09-19 19:50:20 +02:00
mm: add support for direct_IO to highmem pages
2012-07-31 18:42:47 -07:00
mm: hugetlbfs: close race during teardown of hugetlbfs shared page tables
2012-07-31 18:42:50 -07:00
hugetlb/cgroup: migrate hugetlb cgroup info from oldpage to new page during migration
2012-07-31 18:42:41 -07:00
Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO
2012-09-10 16:42:33 -07:00
i2c: pnx: Fix read transactions of >= 2 bytes
2012-09-12 17:52:44 +02:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-30 19:03:41 -07:00
netpoll: check netpoll tx status on the right device
2012-08-14 14:33:32 -07:00
userns: Teach inet_diag to work with user namespaces
2012-08-14 21:55:20 -07:00
init: add comments to keep initcall-names in sync with initcall levels
2012-07-27 09:29:42 +09:30
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
Input: Send events one packet at a time
2012-09-19 19:50:18 +02:00
time: RCU permitted to stop idle entry via softirq
2012-09-23 07:42:52 -07:00
iommu: static inline iommu group stub functions
2012-09-25 12:14:56 +02:00
userns: Convert ipc to use kuid and kgid where appropriate
2012-09-06 22:17:20 -07:00
net: ipv6: fix TCP early demux
2012-08-06 13:33:21 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-10-01 09:06:36 -07:00
ext4: make sure the journal sb is written in ext4_clear_journal_err()
2012-08-05 19:04:57 -04:00
time/jiffies: Rename ACTHZ to SHIFTED_HZ
2012-07-31 17:09:12 +02:00
tty: move the async flags from the serial code into the tty includes
2012-09-05 13:11:03 -07:00
kdb: Turn KGDB_KDB=n stubs into static inlines
2012-09-26 13:42:26 -07:00
printk: remove the now unnecessary "C" annotation for KERN_CONT
2012-07-30 17:25:14 -07:00
linux/kernel.h: Fix warning seen with W=1 due to change in DIV_ROUND_CLOSEST
2012-09-19 06:51:25 -07:00
vtime: Consolidate system/idle context detection
2012-09-25 15:42:37 +02:00
KEYS: linux/key-type.h needs linux/errno.h
2012-07-30 15:08:46 +10:00
userns: Convert security/keys to the new userns infrastructure
2012-09-13 18:28:02 -07:00
tty/serial: Add kgdb_nmi driver
2012-09-26 13:52:36 -07:00
kobject: fix oops with "input0: bad kobj_uevent_env content in show_uevent()"
2012-09-06 10:13:58 -07:00
kprobes/x86: ftrace based optimization for x86
2012-07-31 10:29:59 -04:00
introduce kref_put_mutex()
2012-08-22 10:24:41 -04:00
kthread: Implement park/unpark facility
2012-08-13 17:01:06 +02:00
time: Improve sanity checking of timekeeping inputs
2012-08-15 15:54:01 +02:00
cputime: Use a proper subsystem naming for vtime related APIs
2012-09-25 15:31:31 +02:00
Merge branch 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds into next/drivers
2012-08-13 16:45:48 +02:00
userns: Convert loop to use kuid_t instead of uid_t
2012-09-21 03:13:20 -07:00
mm: memcg: fix compaction/migration failing due to memcg limits
2012-07-31 18:42:48 -07:00
mm/ia64: fix a memory block size bug
2012-09-17 15:00:37 -07:00
phy/micrel: Add missing header to micrel_phy.h
2012-09-24 15:54:33 -04:00
hugetlb: simplify migrate_huge_page()
2012-07-31 18:42:40 -07:00
mISDN: Fix wrong usage of flush_work_sync while holding locks
2012-09-13 14:58:54 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
mm: introduce __GFP_MEMALLOC to allow access to emergency reserves
2012-07-31 18:42:45 -07:00
mm: throttle direct reclaimers if PF_MEMALLOC reserves are low and swap is backed by network storage
2012-07-31 18:42:46 -07:00
ARM: soc: non-critical bug fixes
2012-10-01 18:02:07 -07:00
ARM: Orion: Set eth packet size csum offload limit
2012-08-15 13:58:09 +00:00
new helper: done_path_create()
2012-07-29 21:24:13 +04:00
netdev_printk/dynamic_netdev_dbg: Directly call printk_emit
2012-09-17 06:08:30 -07:00
netlink: Make the sending netlink socket availabe in NETLINK_CB
2012-08-14 21:49:49 -07:00
netpoll: convert several functions to bool
2012-08-14 14:33:32 -07:00
NFS: Fix the initialisation of the readdir 'cookieverf' array
2012-09-04 14:52:42 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
NFS41: add pg_layout_private to nfs_pageio_descriptor
2012-08-02 17:41:18 -04:00
NFSv4: Fix buffer overflow checking in __nfs4_get_acl_uncached
2012-09-06 11:11:53 -04:00
nilfs2: add omitted comments for structures in nilfs2_fs.h
2012-07-30 17:25:19 -07:00
NVMe: Do not set IO queue depth beyond device max
2012-07-27 13:57:23 -04:00
dt: introduce for_each_available_child_of_node, of_get_next_available_child
2012-08-20 02:16:00 -07:00
of/irq: Create stub for of_irq_find_parent when !CONFIG_OF
2012-09-20 12:32:30 +02:00
Platform: OLPC: turn EC driver into a platform_driver
2012-07-31 23:27:30 -04:00
dmaengine: add OMAP DMA engine driver
2012-07-31 12:06:20 +01:00
ARM: OMAP1: move lcd pdata out of arch/arm/*
2012-09-10 16:34:00 -07:00
mm, memcg: move all oom handling to memcontrol.c
2012-07-31 18:42:45 -07:00
mm: sl[au]b: add knowledge of PFMEMALLOC reserve pages
2012-07-31 18:42:45 -07:00
mm: factor out memory isolate functions
2012-07-31 18:42:45 -07:00
memcg: rename config variables
2012-07-31 18:42:43 -07:00
mm: methods for teaching filesystems about PG_swapcache pages
2012-07-31 18:42:47 -07:00
PCI/ACPI: Use DEVICE_ACPI_HANDLE rather than searching acpi_pci_roots
2012-09-24 14:51:23 -06:00
Merge branch 'pci/trivial' into next
2012-09-13 09:08:02 -06:00
serial: set correct baud_base for EXSYS EX-41092 Dual 16950
2012-09-26 13:35:12 -07:00
Merge branch 'pci/bjorn-find-next-ext-cap' into next
2012-08-23 18:32:36 -06:00
PCI: Make pci_error_handlers const
2012-09-07 16:24:59 -06:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-10-01 10:28:49 -07:00
perf: Add ability to attach user level registers dump to sample
2012-08-10 11:31:26 -03:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
platform: Add support for automatic device IDs
2012-08-16 10:32:07 -07:00
PM / Sleep: introduce dpm_for_each_dev
2012-08-17 07:37:35 -07:00
userns: Convert vfs posix_acl support to use kuids and kgids
2012-09-18 01:01:35 -07:00
userns: Pass a userns parameter into posix_acl_to_xattr and posix_acl_from_xattr
2012-09-18 01:01:35 -07:00
printk: remove the now unnecessary "C" annotation for KERN_CONT
2012-07-30 17:25:14 -07:00
userns: Add kprojid_t and associated infrastructure in projid.h
2012-09-18 01:01:37 -07:00
userns: Convert struct dquot dq_id to be a struct kqid
2012-09-18 01:01:41 -07:00
userns: Modify dqget to take struct kqid
2012-09-18 01:01:40 -07:00
rcu: Switch task's syscall hooks on context switch
2012-09-26 15:47:02 +02:00
regmap: irq: Add mask invert flag for enable register
2012-08-30 11:13:41 -07:00
scatterlist: add sg_alloc_table_from_pages function
2012-07-30 12:25:44 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
efifb: Skip DMI checks if the bootloader knows what it's doing
2012-09-17 13:29:23 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
userns: Make seq_file's user namespace accessible
2012-08-14 21:47:55 -07:00
serial: diminish usage of struct serial_uart_config
2012-09-05 13:15:07 -07:00
tty/serial/core: Introduce poll_init callback
2012-09-26 13:47:02 -07:00
serial: add OMAP-specific defines
2012-09-06 09:17:01 -07:00
dmaengine: shdma: restore partial transfer calculation
2012-08-01 13:48:52 +09:00
ipc: add COMPAT_SHMLBA support
2012-07-30 17:25:20 -07:00
xattr: extract simple_xattr code from tmpfs
2012-08-24 15:55:33 -07:00
vmscan: remove obsolete shrink_control comment
2012-07-31 18:42:43 -07:00
netvm: propagate page->pfmemalloc from skb_alloc_page to skb
2012-07-31 18:42:46 -07:00
smpboot: Provide infrastructure for percpu hotplug threads
2012-08-13 17:01:07 +02:00
string: do not export memweight() to userspace
2012-08-21 16:45:03 -07:00
mm: swap: implement generic handler for swap_activate
2012-07-31 18:42:47 -07:00
task_work: task_work_add() should not succeed after exit_task_work()
2012-09-13 16:47:34 +02:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
drivers/misc/ti-st: remove sparse warnings
2012-08-16 10:11:45 -07:00
time: Move ktime_t overflow checking into timespec_valid_strict
2012-09-01 10:24:48 -07:00
timer: Implement TIMER_IRQSAFE
2012-08-21 16:28:31 +02:00
time/jiffies: Rename ACTHZ to SHIFTED_HZ
2012-07-31 17:09:12 +02:00
sched: recover SD_WAKE_AFFINE in select_task_rq_fair and code clean up
2012-08-13 19:02:05 +02:00
trace: Don't declare trace_*_rcuidle functions in modules
2012-09-12 10:20:14 -04:00
userns: Convert taskstats to handle the user and pid namespaces.
2012-09-18 01:01:32 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
TTY: move cdev_add to tty_register_device
2012-08-13 16:45:39 -07:00
tty: move the async flags from the serial code into the tty includes
2012-09-05 13:11:03 -07:00
uprobes: Introduce arch_uprobe_enable/disable_step()
2012-09-15 17:37:28 +02:00
usb/acpi: Use ACPI methods to power off ports.
2012-09-10 13:04:01 -07:00
usb: remove libusual
2012-09-05 17:21:36 -07:00
usbfs: Add a new disconnect-and-claim ioctl (v2)
2012-09-10 11:10:37 -07:00
userns: Add kprojid_t and associated infrastructure in projid.h
2012-09-18 01:01:37 -07:00
vfio: Add PCI device driver
2012-07-31 08:16:24 -06:00
[media] v4l2: Add rangelow and rangehigh fields to the v4l2_hw_freq_seek struct
2012-07-30 20:23:11 -03:00
virtio-blk: return VIRTIO_BLK_F_FLUSH to header.
2012-07-30 13:30:52 +09:30
virtio ids: fix comment for virtio-rng
2012-07-30 13:30:49 +09:30
mm: account for the number of times direct reclaimers get throttled
2012-07-31 18:42:46 -07:00
ARM: dma-mapping: remove custom consistent dma region
2012-07-30 12:25:45 +02:00
mm: remove redundant initialization
2012-07-31 18:42:50 -07:00
onewire: w1-gpio: add ext_pullup_enable pin in platform data
2012-08-16 10:02:33 -07:00
workqueue: deprecate __cancel_delayed_work()
2012-08-21 13:18:24 -07:00
vfs: nuke pdflush from comments
2012-08-04 12:15:37 +04:00
xattr: extract simple_xattr code from tmpfs
2012-08-24 15:55:33 -07:00
xfrm_user: ensure user supplied esn replay window is valid
2012-09-20 18:08:40 -04:00
