Skip to content

LSM: Module stacking for all

Casey Schaufler linux-security-module selinux 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest81 of 90 patches 7 repliesIn review

81 of 90 patches are in this archive. The cover letter announces 90.

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/90LSM: Infrastructure management of the superblockinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +4 more+85 -700 replies
2/90LSM: Infrastructure management of the sock securityinclude/linux/lsm_hooks.h security/apparmor/include/net.h security/apparmor/lsm.c +7 more+144 -1200 replies
3/90LSM: Infrastructure management of the key security blobinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +3 more+75 -360 replies
4/90LSM: Create an lsm_export data structure.include/linux/security.h+12 -00 replies
5/90LSM: Use lsm_export in the inode_getsecid hooksinclude/linux/lsm_hooks.h include/linux/security.h security/security.c +2 more+68 -100 replies
6/90LSM: Use lsm_export in the cred_getsecid hooksinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +1 more+11 -80 replies
7/90LSM: Use lsm_export in the ipc_getsecid and task_getsecid hooksinclude/linux/lsm_hooks.h security/apparmor/lsm.c security/security.c +2 more+32 -180 replies
8/90LSM: Use lsm_export in the kernel_ask_as hooksinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +1 more+41 -70 replies
9/90LSM: Use lsm_export in the getpeersec_dgram hooksinclude/linux/lsm_hooks.h security/apparmor/lsm.c security/security.c +2 more+23 -110 replies
10/90LSM: Use lsm_export in the audit_rule_match hooksinclude/linux/lsm_hooks.h security/apparmor/audit.c security/apparmor/include/audit.h +8 more+58 -310 replies
11/90LSM: Fix logical operation in lsm_export checkssecurity/selinux/include/objsec.h security/smack/smack_lsm.c+2 -20 replies
12/90LSM: Use lsm_export in the secid_to_secctx hooksinclude/linux/lsm_hooks.h security/apparmor/include/secid.h security/apparmor/secid.c +3 more+22 -110 replies
13/90LSM: Use lsm_export in the secctx_to_secid hooksinclude/linux/lsm_hooks.h security/apparmor/include/secid.h security/apparmor/secid.c +3 more+30 -160 replies
14/90LSM: Use lsm_export in security_audit_rule_matchinclude/linux/security.h kernel/auditfilter.c kernel/auditsc.c +2 more+63 -550 replies
15/90LSM: Use lsm_export in security_kernel_act_asinclude/linux/cred.h include/linux/security.h kernel/cred.c +1 more+13 -130 replies
16/90LSM: Use lsm_export in security_socket_getpeersec_dgraminclude/linux/security.h include/net/scm.h net/ipv4/ip_sockglue.c +1 more+15 -130 replies
17/90LSM: Use lsm_export in security_secctx_to_secidinclude/linux/security.h kernel/cred.c net/netfilter/nft_meta.c +3 more+20 -170 replies
18/90LSM: Use lsm_export in security_secid_to_secctxdrivers/android/binder.c include/linux/security.h include/net/scm.h +10 more+69 -360 replies
19/90LSM: Use lsm_export in security_ipc_getsecidinclude/linux/security.h kernel/auditsc.c security/security.c+10 -90 replies
20/90LSM: Use lsm_export in security_task_getseciddrivers/android/binder.c include/linux/security.h kernel/audit.c +7 more+44 -300 replies
21/90LSM: Use lsm_export in security_inode_getsecidinclude/linux/security.h kernel/auditsc.c security/integrity/ima/ima_policy.c +1 more+12 -120 replies
22/90LSM: Use lsm_export in security_cred_getsecidinclude/linux/security.h security/integrity/ima/ima_main.c security/security.c+6 -70 replies
23/90Audit: Change audit_sig_sid to audit_sig_lsminclude/linux/security.h kernel/audit.c kernel/audit.h +1 more+17 -130 replies
24/90Audit: Convert target_sid to an lsm_export structurekernel/audit.h kernel/auditsc.c+14 -190 replies
25/90Audit: Convert osid to an lsm_export structurekernel/audit.c kernel/audit.h kernel/auditsc.c+15 -290 replies
26/90IMA: Clean out lsm_export scaffoldingsecurity/integrity/ima/ima.h security/integrity/ima/ima_api.c security/integrity/ima/ima_appraise.c +2 more+27 -350 replies
27/90NET: Change the UNIXCB from a secid to an lsm_exportinclude/linux/security.h include/net/af_unix.h net/unix/af_unix.c+20 -70 replies
28/90NET: Remove scaffolding on secmarksnet/netfilter/xt_SECMARK.c+7 -10 replies
29/90NET: Remove scaffolding on new secmarksnet/netfilter/nft_meta.c+7 -10 replies
30/90NET: Remove netfilter scaffolding for lsm_exportnet/netfilter/nf_conntrack_netlink.c net/netfilter/nf_conntrack_standalone.c net/netfilter/nfnetlink_queue.c+21 -40 replies
31/90Netlabel: Replace secids with lsm_exportinclude/net/netlabel.h net/ipv4/cipso_ipv4.c net/netlabel/netlabel_kapi.c +8 more+64 -710 replies
32/90LSM: Remove lsm_export scaffolding functionsinclude/linux/security.h+0 -430 replies
33/90IMA: FIXUP prototype using lsm_exportsecurity/integrity/ima/ima.h+2 -20 replies
34/90Smack: Restore the release_secctx hooksecurity/smack/smack_lsm.c+5 -30 replies
35/90AppArmor: Remove unnecessary hook stubsecurity/apparmor/lsm.c+2 -100 replies
36/90LSM: Limit calls to certain module hookssecurity/security.c+28 -40 replies
37/90LSM: Create a data structure for a security contextinclude/linux/security.h+11 -00 replies
38/90LSM: Use lsm_context in secid_to_secctx hooksinclude/linux/lsm_hooks.h security/apparmor/include/secid.h security/apparmor/secid.c +3 more+23 -210 replies
39/90LSM: Use lsm_context in secctx_to_secid hooksinclude/linux/lsm_hooks.h security/apparmor/include/secid.h security/apparmor/secid.c +3 more+15 -120 replies
40/90LSM: Use lsm_context in inode_getsecctx hooksinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +1 more+17 -110 replies
41/90LSM: Use lsm_context in inode_notifysecctx hooksinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +1 more+13 -80 replies
42/90LSM: Use lsm_context in dentry_init_security hooksinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c+15 -100 replies
43/90LSM: Use lsm_context in security_dentry_init_securityfs/nfs/nfs4proc.c include/linux/security.h security/security.c+11 -150 replies
44/90LSM: Use lsm_context in security_inode_notifysecctxfs/kernfs/inode.c fs/nfs/inode.c include/linux/security.h +1 more+13 -120 replies
45/90LSM: Use lsm_context in security_inode_getsecctxfs/kernfs/inode.c fs/nfsd/nfs4xdr.c include/linux/security.h +1 more+16 -250 replies
46/90LSM: Use lsm_context in security_secctx_to_secidinclude/linux/security.h kernel/cred.c net/netfilter/nft_meta.c +3 more+24 -210 replies
47/90LSM: Use lsm_context in release_secctx hooksinclude/linux/lsm_hooks.h security/apparmor/include/secid.h security/apparmor/secid.c +3 more+13 -110 replies
48/90LSM: Use lsm_context in security_release_secctxdrivers/android/binder.c fs/kernfs/dir.c fs/kernfs/inode.c +13 more+109 -1150 replies
49/90LSM: Use lsm_context in security_secid_to_secctxdrivers/android/binder.c include/linux/security.h include/net/scm.h +12 more+37 -480 replies
50/90fs: remove lsm_context scaffoldingfs/kernfs/dir.c fs/kernfs/inode.c fs/kernfs/kernfs-internal.h +5 more+43 -560 replies
51/90LSM: Add the release function to the lsm_contextinclude/linux/lsm_hooks.h include/linux/security.h security/apparmor/lsm.c +4 more+27 -270 replies
52/90LSM: Use lsm_context in inode_setsecctx hooksinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +1 more+14 -80 replies
53/90LSM: Use lsm_context in security_inode_setsecctxfs/nfsd/nfs4proc.c fs/nfsd/vfs.c include/linux/security.h +1 more+17 -110 replies
54/90kernfs: remove lsm_context scaffoldingfs/kernfs/inode.c+7 -120 replies
55/90LSM: Remove unused macrosecurity/security.c+0 -100 replies
56/90LSM: Special handling for secctx lsm hooksinclude/linux/lsm_hooks.h security/security.c+34 -80 replies
57/90SELinux: Use blob offset in current_sidsecurity/selinux/include/objsec.h+5 -20 replies
58/90LSM: Specify which LSM to displayfs/proc/base.c security/security.c+109 -20 replies
59/90AppArmor: Remove the exclusive flagsecurity/apparmor/lsm.c+1 -10 replies
60/90LSM: Add secmark_relabel_packet to the set of one call hooksinclude/linux/lsm_hooks.h security/security.c+18 -10 replies
61/90LSM: Make getting the secmark right cleanerinclude/linux/security.h net/netfilter/nft_meta.c net/netfilter/xt_SECMARK.c+18 -120 replies
62/90netfilter: Fix memory leak introduced with lsm_contextnet/netfilter/nfnetlink_queue.c+6 -120 replies
63/90Smack: Consolidate secmark conversionssecurity/smack/smack_lsm.c+27 -120 replies
64/90netfilter: Remove unnecessary NULL check in lsm_contextnet/netfilter/nfnetlink_queue.c+1 -20 replies
65/90LSM: Add secmark refcounting to call_one listinclude/linux/lsm_hooks.h security/security.c+44 -20 replies
66/90LSM: refactor security_setprocattrsecurity/security.c+45 -790 replies
67/90Smack: Detect if secmarks can be safely usedsecurity/smack/smack.h security/smack/smack_lsm.c security/smack/smack_netfilter.c+43 -130 replies
68/90LSM: Support multiple LSMs using inode_init_securitysecurity/security.c+29 -190 replies
69/90LSM: Use full security context in security_inode_setsecctxsecurity/security.c+108 -23 replies
70/90LSM: Correct handling of ENOSYS in inode_setxattrsecurity/security.c security/selinux/hooks.c security/smack/smack_lsm.c+21 -240 replies
71/90LSM: Infrastructure security blobs for mount optionsinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +1 more+54 -190 replies
72/90LSM: Fix for security_init_inode_securitysecurity/security.c+25 -100 replies
73/90Smack: Advertise the secid to netlabelsecurity/smack/smack_access.c security/smack/smackfs.c+12 -40 replies
74/90LSM: Change error detection for UDP peer securityinclude/linux/lsm_hooks.h include/linux/security.h net/ipv4/ip_sockglue.c +3 more+25 -300 replies
75/90Smack: Fix setting of the CIPSO MLS_CAT flagssecurity/smack/smack_access.c+5 -10 replies
76/90Smack: Set netlabel flags properly on new label importsecurity/smack/smackfs.c+3 -00 replies
77/90Netlabel: Add a secattr comparison API functioninclude/net/netlabel.h net/netlabel/netlabel_kapi.c+58 -00 replies
78/90Smack: Let netlabel do the work on the ambient domainsecurity/smack/smack_lsm.c+8 -230 replies
79/90Smack: Don't set the socket label on each sendsecurity/smack/smack_lsm.c+1 -40 replies
80/90Smack: Let netlabel do the work on connectionssecurity/smack/smack_lsm.c+1 -10 replies
81/90Netlabel: Return the labeling type on socketnet/netlabel/netlabel_kapi.c security/selinux/netlabel.c security/smack/smack_lsm.c+18 -200 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 00/90] LSM: Module stacking for all

This patchset provides the changes required for the any security module to stack safely with any other.

A new process attribute identifies which security module information should be reported by SO_PEERSEC and the /proc/.../attr/current interface. This is provided by /proc/.../attr/display. Writing the name of the security module desired to this interface will set which LSM hooks will be called for this information. The first security module providing the hooks will be used by default.

The use of integer based security tokens (secids) is generally (but not completely) replaced by a structure lsm_export. The lsm_export structure can contain information for each of the security modules that export information outside the LSM layer.

The LSM interfaces that provide "secctx" text strings have been changed to use a structure "lsm_context" instead of a pointer/length pair. In some cases the interfaces used a "char *" pointer and in others a "void *". This was necessary to ensure that the correct release mechanism for the text is used. It also makes many of the interfaces cleaner.

Security modules that use Netlabel must agree on the labels to be used on outgoing packets. If the modules do not agree on the label option to be used the operation will fail.

Netfilter secmarks are restricted to a single security module. The first module using the facility will "own" the secmarks.

git://github.com/cschaufler/lsm-stacking.git#stack-5.1-v2-full

---
 drivers/android/binder.c                |  25 +-
 fs/kernfs/dir.c                         |   6 +-
 fs/kernfs/inode.c                       |  31 +-
 fs/kernfs/kernfs-internal.h             |   3 +-
 fs/nfs/inode.c                          |  13 +-
 fs/nfs/internal.h                       |   8 +-
 fs/nfs/nfs4proc.c                       |  17 +-
 fs/nfs/nfs4xdr.c                        |  16 +-
 fs/nfsd/nfs4proc.c                      |   8 +-
 fs/nfsd/nfs4xdr.c                       |  14 +-
 fs/nfsd/vfs.c                           |   7 +-
 fs/proc/base.c                          |   1 +
 include/linux/cred.h                    |   3 +-
 include/linux/lsm_hooks.h               | 119 +++---
 include/linux/nfs4.h                    |   8 +-
 include/linux/security.h                | 159 ++++++--
 include/net/af_unix.h                   |   2 +-
 include/net/netlabel.h                  |  18 +-
 include/net/scm.h                       |  14 +-
 kernel/audit.c                          |  43 +--
 kernel/audit.h                          |   9 +-
 kernel/auditfilter.c                    |   6 +-
 kernel/auditsc.c                        |  77 ++--
 kernel/cred.c                           |  15 +-
 net/ipv4/cipso_ipv4.c                   |  13 +-
 net/ipv4/ip_sockglue.c                  |  14 +-
 net/netfilter/nf_conntrack_netlink.c    |  29 +-
 net/netfilter/nf_conntrack_standalone.c |  16 +-
 net/netfilter/nfnetlink_queue.c         |  35 +-
 net/netfilter/nft_meta.c                |   8 +-
 net/netfilter/xt_SECMARK.c              |   9 +-
 net/netlabel/netlabel_kapi.c            | 125 ++++--
 net/netlabel/netlabel_unlabeled.c       | 101 +++--
 net/netlabel/netlabel_unlabeled.h       |   2 +-
 net/netlabel/netlabel_user.c            |  13 +-
 net/netlabel/netlabel_user.h            |   2 +-
 net/unix/af_unix.c                      |   6 +-
 security/apparmor/audit.c               |   4 +-
 security/apparmor/include/audit.h       |   2 +-
 security/apparmor/include/net.h         |   6 +-
 security/apparmor/include/secid.h       |   9 +-
 security/apparmor/lsm.c                 |  64 ++--
 security/apparmor/secid.c               |  42 +-
 security/integrity/ima/ima.h            |  14 +-
 security/integrity/ima/ima_api.c        |   9 +-
 security/integrity/ima/ima_appraise.c   |   6 +-
 security/integrity/ima/ima_main.c       |  34 +-
 security/integrity/ima/ima_policy.c     |  19 +-
 security/security.c                     | 653 +++++++++++++++++++++++++++-----
 security/selinux/hooks.c                | 310 +++++++--------
 security/selinux/include/audit.h        |   5 +-
 security/selinux/include/netlabel.h     |   7 +
 security/selinux/include/objsec.h       |  43 ++-
 security/selinux/netlabel.c             |  69 ++--
 security/selinux/ss/services.c          |  18 +-
 security/smack/smack.h                  |  34 ++
 security/smack/smack_access.c           |  14 +-
 security/smack/smack_lsm.c              | 388 ++++++++++---------
 security/smack/smack_netfilter.c        |  48 ++-
 security/smack/smackfs.c                |  23 +-
 60 files changed, 1855 insertions(+), 961 deletions(-)