Linus Torvalds
3556485f15
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ...
Pull security subsystem updates for 3.4 from James Morris:
"The main addition here is the new Yama security module from Kees Cook,
which was discussed at the Linux Security Summit last year. Its
purpose is to collect miscellaneous DAC security enhancements in one
place. This also marks a departure in policy for LSM modules, which
were previously limited to being standalone access control systems.
Chromium OS is using Yama, and I believe there are plans for Ubuntu,
at least.
This patchset also includes maintenance updates for AppArmor, TOMOYO
and others."
Fix trivial conflict in <net/sock.h> due to the jumo_label->static_key
rename.
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (38 commits)
AppArmor: Fix location of const qualifier on generated string tables
TOMOYO: Return error if fails to delete a domain
AppArmor: add const qualifiers to string arrays
AppArmor: Add ability to load extended policy
TOMOYO: Return appropriate value to poll().
AppArmor: Move path failure information into aa_get_name and rename
AppArmor: Update dfa matching routines.
AppArmor: Minor cleanup of d_namespace_path to consolidate error handling
AppArmor: Retrieve the dentry_path for error reporting when path lookup fails
AppArmor: Add const qualifiers to generated string tables
AppArmor: Fix oops in policy unpack auditing
AppArmor: Fix error returned when a path lookup is disconnected
KEYS: testing wrong bit for KEY_FLAG_REVOKED
TOMOYO: Fix mount flags checking order.
security: fix ima kconfig warning
AppArmor: Fix the error case for chroot relative path name lookup
AppArmor: fix mapping of META_READ to audit and quiet flags
AppArmor: Fix underflow in xindex calculation
AppArmor: Fix dropping of allowed operations that are force audited
AppArmor: Add mising end of structure test to caps unpacking
...
2012-03-21 13:25:04 -07:00
backing-dev: fix wakeup timer races with bdi_unregister()
2012-02-01 16:52:49 +08:00
mm: bootmem: try harder to free pages in bulk
2012-01-10 16:30:45 -08:00
mm: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:27 +08:00
mm: compaction: check for overlapping nodes during isolation for migration
2012-02-08 19:03:51 -08:00
mm, x86: Remove debug_pagealloc_enabled
2011-12-06 09:24:07 +01:00
mm: fix implicit stat.h usage in dmapool.c
2011-10-31 09:20:12 -04:00
fadvise: only initiate writeback for specified range with FADV_DONTNEED
2012-01-10 16:30:43 -08:00
switch debugfs to umode_t
2012-01-03 22:54:56 -05:00
mm: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:27 +08:00
mm/filemap_xip.c: fix race condition in xip_file_fault()
2012-02-03 16:16:41 -08:00
mm: delete various needless include <linux/module.h>
2011-10-31 09:20:11 -04:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
mm: thp: fix BUG on mm->nr_ptes
2012-03-05 15:49:43 -08:00
flush_tlb_range() needs ->page_table_lock when ->mmap_sem is not held
2012-03-05 13:51:32 -08:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
mm: thp: tail page refcounting fix
2011-11-02 16:06:57 -07:00
Merge branch 'master' into x86/memblock
2011-11-28 09:46:22 -08:00
mm: more intensive memory corruption debugging
2012-01-10 16:30:42 -08:00
kmemleak: Disable early logging when kmemleak is off by default
2012-01-20 16:57:05 +00:00
mm: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:27 +08:00
mm: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
fs: kill i_alloc_sem
2011-07-20 20:47:46 -04:00
Cross Memory Attach
2011-10-31 17:30:44 -07:00
memblock: Fix size aligning of memblock_alloc_base_nid()
2012-03-01 10:53:18 +01:00
Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2012-03-20 18:11:21 -07:00
mm: compaction: introduce sync-light migration for use by compaction
2012-01-12 20:13:09 -08:00
mm: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:27 +08:00
mm: compaction: introduce sync-light migration for use by compaction
2012-01-12 20:13:09 -08:00
vm: avoid using find_vma_prev() unnecessarily
2012-03-06 18:23:36 -08:00
mempool: fix first round failure behavior
2012-01-10 16:30:45 -08:00
memcg: fix GPF when cgroup removal races with last exit
2012-03-05 15:49:43 -08:00
mm: clarify the radix_tree exceptional cases
2011-08-03 14:25:24 -10:00
vm: avoid using find_vma_prev() unnecessarily
2012-03-06 18:23:36 -08:00
mm: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-03-21 13:25:04 -07:00
mm: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
mm: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
mm: delete various needless include <linux/module.h>
2011-10-31 09:20:11 -04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-03-21 13:25:04 -07:00
mm: collapse security_vm_enough_memory() variants into a single function
2012-02-14 10:45:39 +11:00
Merge branch 'master' into x86/memblock
2011-11-28 09:46:22 -08:00
NOMMU: Don't need to clear vm_mm when deleting a VMA
2012-02-24 08:59:04 -08:00
mm: unify remaining mem_cont, mem, etc. variable names to memcg
2012-01-12 20:13:06 -08:00
Merge branch 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
2012-01-10 16:59:59 -08:00
vfs: fix panic in __d_lookup() with high dentry hashtable counts
2012-02-13 20:45:38 -05:00
page_cgroup: fix horrid swap accounting regression
2012-03-06 08:18:23 -08:00
pagewalk: fix code comment for THP
2011-07-25 20:57:09 -07:00
percpu: use bitmap_clear
2012-01-20 09:23:16 -08:00
Kmemleak patches
2012-01-14 18:11:11 -08:00
Fix race in process_vm_rw_core
2012-02-02 12:55:17 -08:00
mm: delete various needless include <linux/module.h>
2011-10-31 09:20:11 -04:00
mm: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
mm: unify remaining mem_cont, mem, etc. variable names to memcg
2012-01-12 20:13:06 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-03-21 13:25:04 -07:00
Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2012-01-11 18:52:23 -08:00
mm: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
mm,x86,um: move CMPXCHG_DOUBLE config option
2012-01-12 20:13:03 -08:00
mm: delete various needless include <linux/module.h>
2011-10-31 09:20:11 -04:00
mm: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
memcg: fix GPF when cgroup removal races with last exit
2012-03-05 15:49:43 -08:00
memcg: fix GPF when cgroup removal races with last exit
2012-03-05 15:49:43 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-03-21 13:25:04 -07:00
mm/thrash.c: quiet sparse noise
2011-10-31 17:30:50 -07:00
mm: fix comment typo of truncate_inode_pages_range
2012-02-23 11:52:19 +01:00
mm: Map most files to use export.h instead of module.h
2011-10-31 09:20:12 -04:00
mm: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:27 +08:00
SHM_UNLOCK: fix Unevictable pages stranded after swap
2012-01-23 08:38:48 -08:00
mm,x86,um: move CMPXCHG_LOCAL config option
2012-01-12 20:13:03 -08:00
3556485f15