summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-09-051-1/+6
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-08-171-13/+11Star
| |\
| * | net: split rt_genid for ipv4 and ipv6fan.du2013-07-311-1/+6
* | | Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2013-09-051-0/+2
|\ \ \
| * | | module/lsm: Have apparmor module parameters work with no argsSteven Rostedt2013-08-201-0/+2
| |/ /
* | | Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/c...Linus Torvalds2013-09-041-39/+26Star
|\ \ \ | |_|/ |/| |
| * | cgroup: make css_for_each_descendant() and friends include the origin css in ...Tejun Heo2013-08-091-1/+1
| * | cgroup: make hierarchy iterators deal with cgroup_subsys_state instead of cgroupTejun Heo2013-08-091-8/+3Star
| * | cgroup: pass around cgroup_subsys_state instead of cgroup in file methodsTejun Heo2013-08-091-6/+6
| * | cgroup: pass around cgroup_subsys_state instead of cgroup in subsystem methodsTejun Heo2013-08-091-11/+11
| * | cgroup: add css_parent()Tejun Heo2013-08-091-13/+5Star
| * | cgroup: add/update accessors which obtain subsys specific data from cssTejun Heo2013-08-091-1/+1
| * | cgroup: s/cgroup_subsys_state/cgroup_css/ s/task_subsys_state/task_css/Tejun Heo2013-08-091-2/+2
| |/
* / Smack: IPv6 casting error fix for 3.11Casey Schaufler2013-08-061-13/+11Star
|/
* Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2013-07-111-1/+1
|\
| * security: cap_inode_getsecctx returning garbageJ. Bruce Fields2013-05-131-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-07-101-1/+1
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-06-061-20/+14Star
| |\ \
| * | | net: pass info struct via netdevice notifierJiri Pirko2013-05-281-1/+1
| | |/ | |/|
* | | Merge tag 'nfs-for-3.11-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2013-07-096-15/+138
|\ \ \
| * | | NFS: Extend NFS xattr handlers to accept the security namespaceDavid Quigley2013-06-081-0/+1
| * | | NFS: Client implementation of Labeled-NFSDavid Quigley2013-06-081-0/+4
| * | | SELinux: Add new labeling type native labelsDavid Quigley2013-06-083-10/+32
| * | | LSM: Add flags field to security_sb_set_mnt_opts for in kernel mount data.David Quigley2013-06-083-5/+19
| * | | Security: Add Hook to test if the particular xattr is part of a MAC model.David Quigley2013-06-084-0/+29
| * | | Security: Add hook to calculate context based on a negative dentry.David Quigley2013-06-083-0/+53
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2013-07-0331-583/+949
|\ \ \
| * | | evm: audit integrity metadata failuresMimi Zohar2013-06-201-1/+14
| * | | integrity: move integrity_audit_msg()Mimi Zohar2013-06-207-33/+36
| * | | Smack: Fix the bug smackcipso can't set CIPSO correctlyPassion,Zhao2013-06-031-1/+1
| * | | Smack: Fix possible NULL pointer dereference at smk_netlbl_mls()Tetsuo Handa2013-05-281-0/+2
| * | | Smack: Add smkfstransmute mount optionCasey Schaufler2013-05-282-5/+21
| * | | Smack: Improve access check performanceCasey Schaufler2013-05-284-249/+282
| * | | Smack: Local IPv6 port based controlsCasey Schaufler2013-05-282-40/+319
| * | | apparmor: no need to delay vfree()Al Viro2013-05-121-21/+3Star
| * | | Merge tag 'aa-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux...James Morris2013-05-1219-248/+286
| |\ \ \ | | |/ / | |/| |
| | * | apparmor: fix fully qualified name parsingJohn Johansen2013-04-281-2/+4
| | * | apparmor: fix setprocattr arg processing for onexecJohn Johansen2013-04-281-16/+21
| | * | apparmor: localize getting the security context to a few macrosJohn Johansen2013-04-284-21/+24
| | * | apparmor: fix sparse warningsJohn Johansen2013-04-282-11/+11
| | * | apparmor: Fix smatch warning in aa_remove_profilesJohn Johansen2013-04-281-8/+6Star
| | * | apparmor: fix the audit type tableJohn Johansen2013-04-281-1/+1
| | * | apparmor: reserve and mask off the top 8 bits of the base fieldJohn Johansen2013-04-281-7/+9
| | * | apparmor: move the free_profile fn ahead of aa_alloc_profileJohn Johansen2013-04-281-75/+75
| | * | apparmor: remove sid from profilesJohn Johansen2013-04-284-21/+11Star
| | * | apparmor: move perm defines into policy_unpackJohn Johansen2013-04-282-2/+3
| | * | apparmor: misc cleanup of matchJohn Johansen2013-04-282-8/+14
| | * | apparmor: relax the restrictions on setting rlimitsJohn Johansen2013-04-281-3/+12
| | * | apparmor: remove "permipc" commandJohn Johansen2013-04-283-9/+0Star
| | * | apparmor: use common fn to clear task_context for domain transitionsJohn Johansen2013-04-283-16/+20