Will Drewry
e2cfabdfd0
seccomp: add system call filtering using BPF ...
[This patch depends on luto@mit.edu's no_new_privs patch:
https://lkml.org/lkml/2012/1/30/264
The whole series including Andrew's patches can be found here:
https://github.com/redpig/linux/tree/seccomp
Complete diff here:
https://github.com/redpig/linux/compare/1dc65fed...seccomp
]
This patch adds support for seccomp mode 2. Mode 2 introduces the
ability for unprivileged processes to install system call filtering
policy expressed in terms of a Berkeley Packet Filter (BPF) program.
This program will be evaluated in the kernel for each system call
the task makes and computes a result based on data in the format
of struct seccomp_data.
A filter program may be installed by calling:
struct sock_fprog fprog = { ... };
...
prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &fprog);
The return value of the filter program determines if the system call is
allowed to proceed or denied. If the first filter program installed
allows prctl(2) calls, then the above call may be made repeatedly
by a task to further reduce its access to the kernel. All attached
programs must be evaluated before a system call will be allowed to
proceed.
Filter programs will be inherited across fork/clone and execve.
However, if the task attaching the filter is unprivileged
(!CAP_SYS_ADMIN) the no_new_privs bit will be set on the task. This
ensures that unprivileged tasks cannot attach filters that affect
privileged tasks (e.g., setuid binary).
There are a number of benefits to this approach. A few of which are
as follows:
- BPF has been exposed to userland for a long time
- BPF optimization (and JIT'ing) are well understood
- Userland already knows its ABI: system call numbers and desired
arguments
- No time-of-check-time-of-use vulnerable data accesses are possible.
- system call arguments are loaded on access only to minimize copying
required for system call policy decisions.
Mode 2 support is restricted to architectures that enable
HAVE_ARCH_SECCOMP_FILTER. In this patch, the primary dependency is on
syscall_get_arguments(). The full desired scope of this feature will
add a few minor additional requirements expressed later in this series.
Based on discussion, SECCOMP_RET_ERRNO and SECCOMP_RET_TRACE seem to be
the desired additional functionality.
No architectures are enabled in this patch.
Signed-off-by: Will Drewry <wad@chromium.org>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Reviewed-by: Indan Zupancic <indan@nul.nu>
Acked-by: Eric Paris <eparis@redhat.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
v18: - rebase to v3.4-rc2
- s/chk/check/ (akpm@linux-foundation.org ,jmorris@namei.org)
- allocate with GFP_KERNEL|__GFP_NOWARN (indan@nul.nu )
- add a comment for get_u32 regarding endianness (akpm@)
- fix other typos, style mistakes (akpm@)
- added acked-by
v17: - properly guard seccomp filter needed headers (leann@ubuntu.com )
- tighten return mask to 0x7fff0000
v16: - no change
v15: - add a 4 instr penalty when counting a path to account for seccomp_filter
size (indan@nul.nu )
- drop the max insns to 256KB (indan@nul.nu )
- return ENOMEM if the max insns limit has been hit (indan@nul.nu )
- move IP checks after args (indan@nul.nu )
- drop !user_filter check (indan@nul.nu )
- only allow explicit bpf codes (indan@nul.nu )
- exit_code -> exit_sig
v14: - put/get_seccomp_filter takes struct task_struct
(indan@nul.nu ,keescook@chromium.org)
- adds seccomp_chk_filter and drops general bpf_run/chk_filter user
- add seccomp_bpf_load for use by net/core/filter.c
- lower max per-process/per-hierarchy: 1MB
- moved nnp/capability check prior to allocation
(all of the above: indan@nul.nu )
v13: - rebase on to 88ebdda615indan@nul.nu ,oleg@redhat.com)
- removed copy_seccomp (keescook@chromium.org ,indan@nul.nu)
- reworded the prctl_set_seccomp comment (indan@nul.nu )
v11: - reorder struct seccomp_data to allow future args expansion (hpa@zytor.com )
- style clean up, @compat dropped, compat_sock_fprog32 (indan@nul.nu )
- do_exit(SIGSYS) (keescook@chromium.org , luto@mit.edu )
- pare down Kconfig doc reference.
- extra comment clean up
v10: - seccomp_data has changed again to be more aesthetically pleasing
(hpa@zytor.com )
- calling convention is noted in a new u32 field using syscall_get_arch.
This allows for cross-calling convention tasks to use seccomp filters.
(hpa@zytor.com )
- lots of clean up (thanks, Indan!)
v9: - n/a
v8: - use bpf_chk_filter, bpf_run_filter. update load_fns
- Lots of fixes courtesy of indan@nul.nu:
-- fix up load behavior, compat fixups, and merge alloc code,
-- renamed pc and dropped __packed, use bool compat.
-- Added a hidden CONFIG_SECCOMP_FILTER to synthesize non-arch
dependencies
v7: (massive overhaul thanks to Indan, others)
- added CONFIG_HAVE_ARCH_SECCOMP_FILTER
- merged into seccomp.c
- minimal seccomp_filter.h
- no config option (part of seccomp)
- no new prctl
- doesn't break seccomp on systems without asm/syscall.h
(works but arg access always fails)
- dropped seccomp_init_task, extra free functions, ...
- dropped the no-asm/syscall.h code paths
- merges with network sk_run_filter and sk_chk_filter
v6: - fix memory leak on attach compat check failure
- require no_new_privs || CAP_SYS_ADMIN prior to filter
installation. (luto@mit.edu )
- s/seccomp_struct_/seccomp_/ for macros/functions (amwang@redhat.com )
- cleaned up Kconfig (amwang@redhat.com )
- on block, note if the call was compat (so the # means something)
v5: - uses syscall_get_arguments
(indan@nul.nu ,oleg@redhat.com, mcgrathr@chromium.org )
- uses union-based arg storage with hi/lo struct to
handle endianness. Compromises between the two alternate
proposals to minimize extra arg shuffling and account for
endianness assuming userspace uses offsetof().
(mcgrathr@chromium.org , indan@nul.nu )
- update Kconfig description
- add include/seccomp_filter.h and add its installation
- (naive) on-demand syscall argument loading
- drop seccomp_t (eparis@redhat.com )
v4: - adjusted prctl to make room for PR_[SG]ET_NO_NEW_PRIVS
- now uses current->no_new_privs
(luto@mit.edu ,torvalds@linux-foundation.com)
- assign names to seccomp modes (rdunlap@xenotime.net )
- fix style issues (rdunlap@xenotime.net )
- reworded Kconfig entry (rdunlap@xenotime.net )
v3: - macros to inline (oleg@redhat.com )
- init_task behavior fixed (oleg@redhat.com )
- drop creator entry and extra NULL check (oleg@redhat.com )
- alloc returns -EINVAL on bad sizing (serge.hallyn@canonical.com )
- adds tentative use of "always_unprivileged" as per
torvalds@linux-foundation.org and luto@mit.edu
v2: - (patch 2 only)
Signed-off-by: James Morris <james.l.morris@oracle.com>
2012-04-14 11:13:20 +10:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-03-29 15:34:57 -07:00
bcma: add support for on-chip OTP memory used for SPROM storage
2012-03-06 15:16:18 -05:00
can: dev: let can_get_echo_skb() return dlc of CAN frame
2012-02-03 01:21:25 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-03-28 10:01:29 -07:00
mxs-dma : move the mxs dma.h to a more common place
2012-03-27 00:37:23 +01:00
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
Input: ili210x - add support for Ilitek ILI210x based touchscreens
2012-03-17 12:20:44 -07:00
Lockd: shutdown NLM hosts in network namespace context
2012-02-15 00:19:48 -05:00
Various small bugfixes and enhancements, plus two new drivers:
2012-03-30 16:09:02 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
MMC highlights for 3.4:
2012-03-28 20:59:45 -07:00
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
netfilter: ipset: avoid use of kernel-only types
2012-03-26 21:06:30 +02:00
netfilter: ebtables: fix alignment problem in ppc
2012-02-21 13:29:06 +01:00
netfilter: remove ipt_SAME.h and ipt_realm.h
2012-03-07 17:40:56 +01:00
netfilter: merge ipt_LOG and ip6_LOG into xt_LOG
2012-03-07 17:40:49 +01:00
nfsd: add a header describing upcall to nfsdcld
2012-03-26 11:49:47 -04:00
pinctrl: introduce generic pin config
2012-03-12 22:49:02 +01:00
avr32: fix build failures from mis-naming of atmel_nand.h
2012-04-02 14:41:25 -07:00
Add I2C driver for Summit Microelectronics SMB347 Battery Charger.
2012-03-26 20:41:01 +04:00
md: Use existed macros instead of numbers
2012-03-13 11:21:23 +11:00
regulator: Fixes for -rc1
2012-04-04 10:09:30 -07:00
ARM: More device tree support updates
2012-03-28 12:34:33 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
Merge nfs containerization work from Trond's tree
2012-03-26 11:48:54 -04:00
USB: EHCI: Add a generic platform device driver
2012-03-15 12:42:07 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
ACPI: Export interfaces for ioremapping/iounmapping ACPI registers
2012-01-17 04:35:20 -05:00
aio: Use __kernel_ulong_t to define aio_context_t
2012-02-20 12:48:48 -08:00
tty: serial: altera_uart: remove early_altera_uart_setup
2012-02-09 09:04:23 -08:00
iommu/amd: Split amd_iommu_init function
2012-03-01 16:14:48 +01:00
apple_bl: Add register/unregister functions
2012-03-22 09:31:55 -04:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter
2012-03-01 13:38:49 +01:00
atomic: Allow atomic_inc_not_zero to be overridden
2012-03-07 17:06:08 +11:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
constify path argument of audit_log_d_path()
2012-03-20 21:29:40 -04:00
__register_binfmt() made void
2012-03-20 21:29:46 -04:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
bitops: introduce for_each_clear_bit()
2012-03-23 16:58:34 -07:00
block: strip out locking optimization in put_io_context()
2012-02-07 07:51:30 +01:00
bug: consolidate BUILD_BUG_ON with other bug code
2012-03-04 17:54:35 -05:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
2012-01-14 18:36:33 -08:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
cgroup: revert ss_id_lock to spinlock
2012-03-21 17:55:01 -07:00
mm: zcache/tmem/cleancache: s/flush/invalidate/
2012-01-23 16:06:37 -05:00
clk: basic clock hardware types
2012-03-16 20:35:02 +00:00
clk: basic clock hardware types
2012-03-16 20:35:02 +00:00
clk: introduce the common clock framework
2012-03-16 20:35:01 +00:00
clocksource: Get rid of clocksource_calc_mult_shift()
2012-02-01 18:37:39 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
vmscan: only defer compaction for failed order and higher
2012-03-21 17:54:56 -07:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 18:12:23 -07:00
include/ and checkpatch: prefer __scanf to __attribute__((format(scanf,...)
2012-03-23 16:58:36 -07:00
kernel.h: add BUILD_BUG() macro
2012-01-10 16:30:42 -08:00
compiler.h: Fix typo
2012-02-28 16:02:54 +01:00
drivers: hv: kvp: Add/cleanup connector defines
2012-02-02 15:30:47 -08:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
cpuidle: power_usage should be declared signed integer
2012-03-30 03:23:30 -04:00
cpumask: remove old cpu_*_map.
2012-03-29 15:38:31 +10:30
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 14:46:05 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
crc32: bolt on crc32c
2012-03-23 16:58:38 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
crypto: user - Fix size of netlink dump message
2012-03-29 19:52:48 +08:00
vfs: d_alloc_root() gone
2012-03-20 21:29:37 -04:00
dccp: fix bug in sequence number validation during connection setup
2012-03-03 09:02:52 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
debugfs-related mode_t whack-a-mole
2012-03-20 21:29:53 -04:00
PM / devfreq: add relation of recommended frequency.
2012-03-17 21:51:34 +01:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-03-21 18:55:10 -07:00
digsig: changed type of the timestamp
2012-02-20 19:46:36 +11:00
common: DMA-mapping: add NON-CONSISTENT attribute
2012-03-28 16:36:44 +02:00
Merge branch 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
2012-03-28 15:02:41 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-04-04 17:13:43 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-03-29 15:34:57 -07:00
dmaengine/dw_dmac: Remove unused fields in struct dw_dma_slave
2012-02-22 18:15:39 +05:30
dynamic_debug: reduce lineno field to a saner 18 bits
2012-01-24 12:48:54 -08:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2012-03-28 14:24:40 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
block: don't call elevator callbacks for plug merges
2012-02-08 09:19:42 +01:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
drivercore: Add driver probe deferral mechanism
2012-03-08 11:53:13 -08:00
rename dev_hw_addr_random and remove redundant second
2012-02-13 00:46:41 -05:00
ethtool: Remove exception to the requirement of holding RTNL lock
2012-04-06 02:43:12 -04:00
epoll: limit paths
2012-01-12 20:13:04 -08:00
migrate ext2_fs.h guts to fs/ext2/ext2.h
2012-03-31 16:03:16 -04:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
Replace the fd_sets in struct fdtable with an array of unsigned longs
2012-02-19 10:30:57 -08:00
vfs: drop_file_write_access() made static
2012-03-20 21:29:32 -04:00
net/compat.c,linux/filter.h: share compat_sock_fprog
2012-04-14 11:13:19 +10:00
firewire: allow explicit flushing of iso packet completions
2012-03-18 22:15:39 +01:00
firewire: restore the device.h include in linux/firewire.h
2012-04-02 14:41:27 -07:00
PM / Hibernate: Fix s2disk regression related to freezing workqueues
2012-01-29 20:35:52 +01:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
ftrace, perf: Add filter support for function trace event
2012-02-21 11:08:30 -05:00
perf: Add ifdef to remove unused enum switch warnings
2012-03-14 08:47:58 -04:00
block: Fix NULL pointer dereference in sd_revalidate_disk
2012-03-02 10:38:33 +01:00
mm: try to distribute dirty pages fairly across zones
2012-01-10 16:30:43 -08:00
GFS2: FITRIM ioctl support
2012-02-28 17:10:21 +00:00
GPIO changes for v3.4
2012-03-28 14:08:46 -07:00
Input: gpio_keys - add support for interrupt only keys
2012-03-19 17:56:18 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE
2012-03-21 17:55:02 -07:00
hugetlbfs: fix alignment of huge page requests
2012-03-21 17:54:59 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
Tools: hv: Support enumeration from all the pools
2012-03-16 13:36:04 -07:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
net: Add framework to allow sending packets with customized CRC.
2012-02-24 01:37:35 -08:00
eql: dont rely on HZ=100
2012-03-27 22:45:26 -04:00
rtnetlink: Fix problem with buffer allocation
2012-02-21 16:56:45 -05:00
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
2012-03-04 20:41:38 -05:00
team: send only changed options/ports via netlink
2012-01-24 15:51:00 -05:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
ipv4: Implement IP_UNICAST_IF socket option.
2012-02-08 15:52:45 -05:00
ipv6: Implement IPV6_UNICAST_IF socket option.
2012-02-08 15:52:45 -05:00
inet_diag: Rename inet_diag_req_compat into inet_diag_req
2012-01-11 12:56:06 -08:00
arp: allow arp processing to honor per interface arp_accept sysctl
2012-03-16 23:00:20 -07:00
module_param: make bool parameters really bool (core code)
2012-01-13 09:32:18 +10:30
cpuset: mm: reduce large amounts of memory barrier related damage v3
2012-03-21 17:54:59 -07:00
Merge branch 'for-next' of github.com:rydberg/linux into next
2012-03-09 10:56:35 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
block: exit_io_context() should call elevator_exit_icq_fn()
2012-02-15 09:45:53 +01:00
PCI: Move struct resource_list to setup-bus.c
2012-02-14 08:44:55 -08:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
net: implement IP_RECVTOS for IP_PKTOPTIONS
2012-02-13 00:46:41 -05:00
irq_domain: Centralize definition of irq_dispose_mapping()
2012-02-26 16:48:06 -07:00
ppp: Replace uses of <linux/if_ppp.h> with <linux/ppp-ioctl.h>
2012-03-04 20:41:38 -05:00
[media] ivtv: add IVTV_IOC_PASSTHROUGH_MODE
2012-02-14 13:45:56 -02:00
jbd2: cleanup journal tail after transaction commit
2012-03-13 22:45:38 -04:00
jbd2: remove bh_state lock from checkpointing code
2012-03-13 22:45:25 -04:00
static keys: Inline the static_key_enabled() function
2012-02-28 20:01:08 +01:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
seccomp: add system call filtering using BPF
2012-04-14 11:13:20 +10:00
pagemap: export KPF_THP
2012-03-21 17:54:57 -07:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-31 13:34:04 -07:00
kdump: define KEXEC_NOTE_BYTES arch specific for s390x
2012-01-23 08:38:48 -08:00
NFS client updates for Linux 3.4
2012-03-23 08:53:47 -07:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()
2012-03-29 17:41:25 -05:00
PM / Sleep: Mitigate race between the freezer and request_firmware()
2012-03-28 23:30:28 +02:00
kmsg_dump: don't run on non-error paths by default
2012-03-05 15:49:42 -08:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
Fix compile breakage with kref.h
2012-01-17 15:40:51 -08:00
KVM: Allow host IRQ sharing for assigned PCI 2.3 devices
2012-03-08 14:11:36 +02:00
Merge branch 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2012-03-28 14:35:31 -07:00
leds-lm3530: support pwm input mode
2012-03-23 16:58:35 -07:00
drivers/leds/leds-lp5521.c: support led pattern data
2012-03-23 16:58:34 -07:00
leds: add driver for TCA6507 LED controller
2012-01-10 16:30:49 -08:00
[SCSI] libsas: async ata scanning
2012-02-29 15:35:41 -06:00
include/linux/linkage.h: remove unused ATTRIB_NORET macro
2012-01-12 20:13:03 -08:00
Add #includes needed to permit the removal of asm/system.h
2012-03-28 18:30:03 +01:00
backlight: new backlight driver for LP855x devices
2012-03-23 16:58:33 -07:00
lp8727_charger: Correct typos on the comment
2012-03-26 20:40:59 +04:00
lsm_audit: don't specify the audit pre/post callbacks in 'struct common_audit_data'
2012-04-03 09:49:59 -07:00
magic.h: move some FS magic numbers into magic.h
2012-03-23 16:58:31 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
math: Introduce div64_long
2012-03-15 21:41:34 +01:00
mdio.h: Include linux/types.h
2012-03-03 15:04:45 -05:00
memcg: fix performance of mem_cgroup_begin_update_page_stat()
2012-03-21 17:55:02 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
mm/mempolicy.c: mpol_equal(): use bool
2012-01-10 16:30:45 -08:00
mm: replace PAGE_MIGRATION with IS_ENABLED(CONFIG_MIGRATION)
2012-03-21 17:54:57 -07:00
mm: fix warnings regarding enum migrate_mode
2012-01-23 08:38:47 -08:00
vhost-net: add module alias (v2.1)
2012-01-13 10:12:23 -08:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-03-28 17:19:28 -07:00
mm: remove del_page_from_lru, add page_off_lru
2012-01-12 20:13:10 -08:00
mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL
2012-01-12 20:13:03 -08:00
vmscan: only defer compaction for failed order and higher
2012-03-21 17:54:56 -07:00
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -07:00
module: move __module_get and try_module_get() out of line.
2012-03-26 12:50:52 +10:30
params: <level>_initcall-like kernel parameters
2012-03-26 12:50:51 +10:30
lib/mpi: replaced MPI_NULL with normal NULL
2012-02-02 00:23:14 +11:00
[SCSI] st: expand ability to write immediate filemarks
2012-03-27 08:26:34 +01:00
sock: Introduce the SO_PEEK_OFF sock option
2012-02-21 15:03:48 -05:00
net: Support RX-ALL feature flag.
2012-02-24 01:42:07 -08:00
net: fix /proc/net/dev regression
2012-04-03 17:23:23 -04:00
static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()
2012-02-24 10:05:59 +01:00
netlink: allow to pass data pointer to netlink_dump_start() callback
2012-02-26 14:10:44 -05:00
NFC: Add device powered netlink attribute
2012-03-06 15:16:19 -05:00
SUNRPC: handle RPC client pipefs dentries by network namespace aware routines
2012-01-31 18:20:25 -05:00
Merge nfs containerization work from Trond's tree
2012-03-26 11:48:54 -04:00
NFS: Fix more NFS debug related build warnings
2012-03-21 09:31:44 -04:00
NFS: Remove unnecessary includes from linux/nfs_fs_i.h
2012-01-31 18:20:28 -05:00
NFS: Request fh_expire_type attribute in "server caps" operation
2012-03-02 17:18:10 -05:00
NFS: Undo changes to idmap.h
2012-03-05 15:26:47 -05:00
SUNRPC: add sending,pending queue and max slot to xprt stats
2012-02-16 14:55:27 -05:00
NFSv4.1: Clean ups and bugfixes for the pNFS read/writeback/commit code
2012-03-17 11:09:33 -04:00
NFS: Remove nfs4_setup_sequence from generic rename code
2012-03-21 09:31:46 -04:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
cfg80211: Add background scan period attribute.
2012-03-12 14:19:34 -04:00
nmi watchdog: do not use cpp symbol in Kconfig
2012-03-23 16:58:31 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-03-28 14:41:36 -07:00
of/address: add empty static inlines for !CONFIG_OF
2012-02-16 06:11:23 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
of_gpio: add support of of_gpio_named_count to be able to count named gpio
2012-02-05 23:08:30 -07:00
irq_domain: Centralize definition of irq_dispose_mapping()
2012-02-26 16:48:06 -07:00
of/mtd/nand: add generic bindings and helpers
2012-03-15 23:28:19 +08:00
dt: fix twl4030 for non-dt compile on x86
2012-03-05 08:09:09 -07:00
OMAP1: pass LCD config with omapfb_set_lcd_config()
2012-02-23 09:39:23 +02:00
mm, oom: force oom kill on sysrq+f
2012-03-21 17:54:58 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
padata: Fix race on sequence number wrap
2012-03-14 17:25:56 +08:00
mm: more intensive memory corruption debugging
2012-01-10 16:30:42 -08:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
memcg: remove PCG_FILE_MAPPED
2012-03-21 17:55:01 -07:00
mm: fewer underscores in ____pagevec_lru_add
2012-01-12 20:13:10 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-03-23 14:02:12 -07:00
tg3: Recode PCI MRRS adjustment as a PCI quirk
2012-03-04 20:54:01 -05:00
PCI: Add PCI_EXP_TYPE_PCIE_BRIDGE value
2012-02-23 12:05:21 -08:00
percpu: fix __this_cpu_{sub,inc,dec}_return() definition
2012-03-04 09:34:15 -08:00
perf: Move mmap page data_head offset assertion out of header
2012-03-24 08:46:59 +01:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
pidns: add reboot_pid_ns() to handle the reboot syscall
2012-03-28 17:14:36 -07:00
magic.h: move some FS magic numbers into magic.h
2012-03-23 16:58:31 -07:00
net/sched: sch_plug - Queue traffic until an explicit release command
2012-02-07 12:54:56 -05:00
Merge branch 'pm-qos'
2012-03-16 21:49:24 +01:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
PM / QoS: add pm_qos_update_request_timeout() API
2012-03-28 23:31:24 +02:00
PM / Sleep: Add more wakeup source initialization routines
2012-03-04 23:08:46 +01:00
poll: add poll_requested_events() and poll_does_not_wait() functions
2012-03-23 16:58:38 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
ppp: Change copyright notices from ANU to me
2012-03-04 20:41:38 -05:00
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
2012-03-04 20:41:38 -05:00
ppp: Change copyright notices from ANU to me
2012-03-04 20:41:38 -05:00
Add PR_{GET,SET}_NO_NEW_PRIVS to prevent execve from granting privs
2012-04-14 11:13:18 +10:00
sched/rt: Document scheduler related skip-resched-check sites
2012-03-01 10:28:04 +01:00
driver core merge for 3.4-rc1
2012-03-20 11:16:20 -07:00
procfs: make proc_get_link to use dentry instead of inode
2012-01-10 16:30:54 -08:00
lib: proportion: lower PROP_MAX_SHIFT to 32 on 64-bit kernel
2012-02-01 16:53:46 +08:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
fs: initial qnx6fs addition
2012-03-20 21:29:38 -04:00
quota: Pass information that quota is stored in system file to userspace
2012-01-12 13:09:09 +01:00
radix-tree: introduce bit-optimized iterator
2012-03-28 17:14:37 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
rcu: Prevent RCU callbacks from executing before scheduler initialized
2012-02-21 09:03:41 -08:00
rcu: Call out dangers of expedited RCU primitives
2012-02-21 09:06:08 -08:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
move private bits of reiserfs_fs.h to fs/reiserfs/reiserfs.h
2012-03-20 21:29:43 -04:00
take private bits of reiserfs_xattr.h to fs/reiserfs/xattr.h
2012-03-20 21:29:42 -04:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
remoteproc: remove the hardcoded vring alignment
2012-03-06 19:14:37 +02:00
net: introduce res_counter_charge_nofail() for socket allocations
2012-01-22 15:08:46 -05:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
tracing/ring-buffer: Only have tracing_on disable tracing buffers
2012-02-22 15:50:28 -05:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
rmap: remove __anon_vma_link() declaration
2012-03-21 17:54:57 -07:00
rpmsg: add virtio-based remote processor messaging bus
2012-02-08 22:53:58 +02:00
rtc: Provide flag for rtc devices that don't support UIE
2012-03-15 18:23:10 -07:00
rtnetlink: Fix problem with buffer allocation
2012-02-21 16:56:45 -05:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
DMA: sa11x0: add SA-11x0 DMA driver
2012-03-07 11:32:21 +00:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
seccomp: kill the seccomp_t typedef
2012-04-14 11:13:19 +10:00
seccomp: add system call filtering using BPF
2012-04-14 11:13:20 +10:00
Add PR_{GET,SET}_NO_NEW_PRIVS to prevent execve from granting privs
2012-04-14 11:13:18 +10:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
TTY: serial, simplify ASYNC_USR_MASK
2012-03-08 11:38:50 -08:00
serial: introduce generic port in/out helpers
2012-03-09 12:47:56 -08:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
sh: remove clk_ops
2012-03-12 22:19:13 +01:00
dma: sh_dma: not all SH DMAC implementations support MEMCPY
2012-02-01 22:23:53 +05:30
net: sh_eth: change the condition of initialization
2012-02-16 17:08:09 -05:00
sh: intc: remove dependency on NR_IRQS
2012-01-25 20:37:48 -06:00
SHM_UNLOCK: fix Unevictable pages stranded after swap
2012-01-23 08:38:48 -08:00
signal: add block_sigmask() for adding sigmask to current->blocked
2012-01-10 16:30:54 -08:00
epoll: introduce POLLFREE to flush ->signalfd_wqh before kfree()
2012-02-24 11:42:50 -08:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
slab: introduce kmalloc_array()
2012-03-06 11:01:33 +02:00
tracing/mm: Move include of trace/events/kmem.h out of header into slab.c
2012-01-09 14:19:33 -08:00
Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2012-03-28 15:04:26 -07:00
smp: add func to IPI cpus based on parameter func
2012-03-28 17:14:35 -07:00
tcp: reduce out_of_order memory use
2012-03-19 16:53:08 -04:00
tcp: tcp_sendpages() should call tcp_push() once
2012-04-05 19:04:27 -04:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
2012-03-23 13:18:57 +01:00
rcu: Convert WARN_ON_ONCE() in rcu_lock_acquire() to lockdep
2012-02-21 09:06:09 -08:00
static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()
2012-02-24 10:05:59 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
tty: sparc: rename drivers/tty/serial/suncore.h -> include/linux/sunserialcore.h
2012-02-10 10:44:35 -08:00
PM / Sleep: Drop suspend_stats_update()
2012-02-17 23:36:23 +01:00
memcg swap: use mem_cgroup_uncharge_swap fix
2012-04-05 15:25:51 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
drivers/base: add bus for System-on-Chip devices
2012-02-10 11:42:25 -08:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
sysctl: Add register_sysctl for normal sysctl users
2012-01-24 16:40:30 -08:00
sysinfo: Use explicit types in <linux/sysinfo.h>
2012-02-20 12:48:47 -08:00
x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.
2012-03-13 14:06:33 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-03-01 17:57:40 -05:00
thermal: Rename generate_netlink_event
2012-01-23 03:15:25 -05:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 18:12:23 -07:00
ntp: Fix leap-second hrtimer livelock
2012-03-22 19:43:43 -07:00
constify path argument of trace_seq_path()
2012-03-20 21:29:40 -04:00
ptrace: the killed tracee should not enter the syscall
2012-03-23 16:58:40 -07:00
static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()
2012-02-24 10:05:59 +01:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
TTY: tty_driver, document tty->ops->shutdown limitation
2012-03-08 11:38:51 -08:00
USB: dynamically allocate usb_device children pointers instead of using a fix array
2012-03-13 14:24:07 -07:00
[media] V4L: Improve the selection API documentation
2012-03-19 15:33:24 -03:00
virtio: drop thaw PM operation
2012-03-31 08:09:50 +05:30
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -07:00
virtio: harsher barriers for rpmsg.
2012-01-12 15:44:42 +10:30
[SCSI] virtio-scsi: SCSI driver for QEMU based virtual machines
2012-02-19 09:50:20 -06:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core
2012-03-27 20:15:37 +02:00
Block: use a freezable workqueue for disk-event polling
2012-03-02 10:51:00 +01:00
writeback: fix typo in the writeback_control comment
2012-03-07 16:08:46 +01:00
e2cfabdfd0