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
9p: Reduce object size with CONFIG_NET_9P_DEBUG
2012-01-05 10:51:44 -06:00
Bluetooth: fix conding style issues all over the tree
2012-03-08 02:02:26 -03:00
caif-hsi: Add RX flip buffer
2012-02-04 16:06:28 -05:00
af_iucv: add shutdown for HS transport
2012-03-07 22:52:24 -08:00
netfilter: xt_LOG: add __printf() to sb_add()
2012-03-07 17:41:52 +01:00
netns: Fail conspicously if someone uses net_generic at an inappropriate time.
2012-01-27 21:06:02 -05:00
NFC: NCI code identation fixes
2012-03-06 15:16:25 -05:00
net: dont hold rtnl mutex during netlink dump callbacks
2011-05-02 15:26:28 -07:00
sctp: Export sctp_do_peeloff
2012-03-08 13:52:08 -08:00
net: sched: constify tcf_proto and tc_action
2011-07-06 02:52:16 -07:00
ipv6: Remove never used function inet6_ac_check().
2012-02-01 16:14:17 -05:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
af_unix: Move CINQ/COUTQ code to helpers
2011-12-30 16:45:45 -05:00
ipv4: Eliminate spurious argument to __ipv4_neigh_lookup
2012-02-15 17:48:35 -05:00
atm: clip: Use device neigh support on top of "arp_tbl".
2011-11-30 18:51:03 -05:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
cfg80211: remove unused wext handler exports
2011-08-08 14:26:29 -04:00
cfg80211: clarify timestamp in cfg80211_inform_bss
2012-03-13 14:54:20 -04:00
doc: Update the email address for Paul Moore in various source files
2011-08-01 17:58:33 -07:00
net: get rid of some pointless casts to sockaddr
2012-03-11 19:11:22 -07:00
dcb: Add stub routines for !CONFIG_DCB
2011-10-06 15:49:51 -04:00
net: dcb: getnumtcs()/setnumtcs() should return an int
2012-03-02 18:16:49 -08:00
decnet: net/dn.h needs net/flow.h
2012-02-15 16:37:44 -05:00
dsa: Include linux/if_ether.h to fix build error
2011-12-01 11:41:06 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-12-23 17:13:56 -05:00
net: Rename the dst_opt default_mtu method to mtu
2011-11-26 14:29:50 -05:00
ipv4: reset flowi parameters on route connect
2012-02-04 19:29:48 -05:00
flow_dissector: use a 64bit load/store
2011-11-29 13:17:03 -05:00
garp: remove last synchronize_rcu() call
2011-05-12 17:46:56 -04:00
net: Deinline __nlmsg_put and genlmsg_put. -7k code on i386 defconfig.
2012-01-30 15:22:06 -05:00
ipv4: reduce percpu needs for icmpmsg mibs
2011-11-09 16:04:20 -05:00
wireless: move ieee80211chan2mhz macro
2011-11-11 12:32:50 -05:00
6LoWPAN: add fragmentation support
2011-11-14 00:19:42 -05:00
ipv6: updates to privacy addresses per RFC 4941.
2011-08-01 18:05:00 -07:00
inet: Pass flowi to ->queue_xmit().
2011-05-08 15:28:28 -07:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
net: rename sk_clone to sk_clone_lock
2011-11-08 17:07:07 -05:00
inet: add rfc 3168 extract in front of INET_ECN_encapsulate()
2011-10-22 01:25:23 -04:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
net: implement IP_RECVTOS for IP_PKTOPTIONS
2012-02-13 00:46:41 -05:00
inet: remove rcu protection on tw_net
2011-12-14 13:34:55 -05:00
route: Remove redirect_genid
2012-03-08 00:30:32 -08:00
ipv4: Make ip_call_ra_chain() return bool.
2012-03-09 14:34:50 -08:00
IPv6: Avoid taking write lock for /proc/net/ipv6_route
2011-12-30 17:07:33 -05:00
Merge branch 'nf-next' of git://1984.lsi.us.es/net-next
2011-12-25 02:21:45 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-01-02 18:56:49 -05:00
ipv6: Add fragment reporting to ipv6_skip_exthdr().
2011-12-03 09:35:10 -08:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
wan: make LAPB callbacks const
2011-09-16 19:20:20 -04:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
bonding,llc: Fix structure sizeof incompatibility for some PDUs
2011-05-13 15:13:24 -04:00
mac80211: rename bss_conf timestamp to last_tsf
2012-03-13 14:54:20 -04:00
ipv6: Remove neigh argument from ndisc_send_redirect()
2012-01-27 21:00:08 -05:00
ipv6: Use universal hash for NDISC.
2011-12-28 15:06:58 -05:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
net: Kill ratelimit.h dependency in linux/net.h
2011-05-27 13:41:33 -04:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
doc: Update the email address for Paul Moore in various source files
2011-08-01 17:58:33 -07:00
net: Deinline __nlmsg_put and genlmsg_put. -7k code on i386 defconfig.
2012-01-30 15:22:06 -05:00
netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=m
2012-02-10 15:08:57 -05:00
net: ping: fix build failure
2011-05-17 14:16:58 -04:00
net: sched: constify tcf_proto and tc_action
2011-07-06 02:52:16 -07:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
net: Remove __KERNEL__ cpp checks from include/net
2011-04-24 10:54:56 -07:00
net_sched: sfq: add optional RED on top of SFQ
2012-01-12 20:05:28 -08:00
cfg80211: pass DFS region to drivers through reg_notifier()
2011-11-21 16:20:41 -05:00
tcp: Change possible SYN flooding messages
2011-09-15 14:49:43 -04:00
ipv4: reset flowi parameters on route connect
2012-02-04 19:29:48 -05:00
rtnetlink: Fix problem with buffer allocation
2012-02-21 16:56:45 -05:00
net: Make qdisc_skb_cb upper size bound explicit.
2012-02-09 13:50:34 -05:00
af_unix: dont send SCM_CREDENTIALS by default
2011-09-28 13:29:50 -04:00
tcp: add const qualifiers where possible
2011-10-21 05:22:42 -04:00
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2012-01-09 13:08:28 -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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-03-01 17:57:40 -05:00
cgroup: remove cgroup_subsys argument from callbacks
2012-02-02 09:20:22 -08:00
net: relax PKTINFO non local ipv6 udp xmit check
2011-08-30 17:39:01 -04:00
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
net: ipv4: Standardize prefixes for message logging
2012-03-12 17:05:21 -07:00
net: wimax: Remove of unused 'rfkill_input' pointer
2011-06-24 17:50:44 -07:00
xfrm: remove unneeded method typedef declaration in net/xfrm.h.
2012-02-25 20:19:24 -05:00
3556485f15