Skip to content

LSM: Module stacking for AppArmor

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

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest58 patches 21 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/58LSM: Infrastructure management of the superblockinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +4 more+85 -701 reply
1/58LSM: Infrastructure management of the superblockinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +4 more+85 -700 replies
2/58LSM: Infrastructure management of the sock securityinclude/linux/lsm_hooks.h security/apparmor/include/net.h security/apparmor/lsm.c +7 more+144 -1201 reply
2/58LSM: 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/58LSM: Infrastructure management of the key security blobinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +3 more+75 -361 reply
3/58LSM: Infrastructure management of the key security blobinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +3 more+75 -360 replies
4/58LSM: Create an lsm_export data structure.include/linux/security.h+12 -02 replies
4/58LSM: Create an lsm_export data structure.include/linux/security.h+12 -00 replies
5/58LSM: Use lsm_export in the inode_getsecid hooksinclude/linux/lsm_hooks.h include/linux/security.h security/security.c +2 more+68 -103 replies
5/58LSM: 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/58LSM: Use lsm_export in the cred_getsecid hooksinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +1 more+11 -80 replies
6/58LSM: 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/58LSM: 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
7/58LSM: 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/58LSM: 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
8/58LSM: 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/58LSM: Use lsm_export in the getpeersec_dgram hooksinclude/linux/lsm_hooks.h security/apparmor/lsm.c security/security.c +2 more+22 -100 replies
9/58LSM: Use lsm_export in the getpeersec_dgram hooksinclude/linux/lsm_hooks.h security/apparmor/lsm.c security/security.c +2 more+22 -100 replies
10/58LSM: 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
10/58LSM: 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/58LSM: 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
11/58LSM: 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
12/58LSM: 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
12/58LSM: 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
13/58LSM: Use lsm_export in security_audit_rule_matchinclude/linux/security.h kernel/auditfilter.c kernel/auditsc.c +2 more+63 -550 replies
13/58LSM: Use lsm_export in security_audit_rule_matchinclude/linux/security.h kernel/auditfilter.c kernel/auditsc.c +2 more+63 -550 replies
14/58LSM: Use lsm_export in security_kernel_act_asinclude/linux/cred.h include/linux/security.h kernel/cred.c +1 more+13 -130 replies
14/58LSM: Use lsm_export in security_kernel_act_asinclude/linux/cred.h include/linux/security.h kernel/cred.c +1 more+13 -130 replies
15/58LSM: 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
15/58LSM: 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
16/58LSM: Use lsm_export in security_secctx_to_secidinclude/linux/security.h kernel/cred.c net/netfilter/nft_meta.c +3 more+20 -170 replies
16/58LSM: Use lsm_export in security_secctx_to_secidinclude/linux/security.h kernel/cred.c net/netfilter/nft_meta.c +3 more+20 -170 replies
17/58LSM: Use lsm_export in security_secid_to_secctxdrivers/android/binder.c include/linux/security.h include/net/scm.h +10 more+69 -360 replies
17/58LSM: Use lsm_export in security_secid_to_secctxdrivers/android/binder.c include/linux/security.h include/net/scm.h +10 more+69 -360 replies
18/58LSM: Use lsm_export in security_ipc_getsecidinclude/linux/security.h kernel/auditsc.c security/security.c+10 -90 replies
19/58LSM: Use lsm_export in security_task_getseciddrivers/android/binder.c include/linux/security.h kernel/audit.c +7 more+44 -300 replies
20/58LSM: Use lsm_export in security_inode_getsecidinclude/linux/security.h kernel/auditsc.c security/integrity/ima/ima_policy.c +1 more+12 -120 replies
21/58LSM: Use lsm_export in security_cred_getsecidinclude/linux/security.h security/integrity/ima/ima_main.c security/security.c+6 -70 replies
22/58Audit: Change audit_sig_sid to audit_sig_lsminclude/linux/security.h kernel/audit.c kernel/audit.h +1 more+17 -137 replies
23/58Audit: Convert target_sid to an lsm_export structurekernel/audit.h kernel/auditsc.c+14 -190 replies
24/58Audit: Convert osid to an lsm_export structurekernel/audit.c kernel/audit.h kernel/auditsc.c+15 -290 replies
25/58IMA: Clean out lsm_export scaffoldingsecurity/integrity/ima/ima.h security/integrity/ima/ima_api.c security/integrity/ima/ima_appraise.c +2 more+27 -352 replies
26/58NET: 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
27/58NET: Remove scaffolding on secmarksnet/netfilter/xt_SECMARK.c+7 -10 replies
28/58NET: Remove scaffolding on new secmarksnet/netfilter/nft_meta.c+7 -10 replies
29/58NET: 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
30/58Netlabel: Replace secids with lsm_exportinclude/net/netlabel.h net/ipv4/cipso_ipv4.c net/netlabel/netlabel_kapi.c +8 more+64 -710 replies
31/58LSM: Remove lsm_export scaffolding functionsinclude/linux/security.h+0 -430 replies
32/58IMA: FIXUP prototype using lsm_exportsecurity/integrity/ima/ima.h+2 -20 replies
33/58Smack: Restore the release_secctx hooksecurity/smack/smack_lsm.c+5 -30 replies
34/58AppArmor: Remove unnecessary hook stubsecurity/apparmor/lsm.c+2 -100 replies
35/58LSM: Limit calls to certain module hookssecurity/security.c+28 -40 replies
36/58LSM: Create a data structure for a security contextinclude/linux/security.h+11 -00 replies
37/58LSM: 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
38/58LSM: 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
39/58LSM: Use lsm_context in inode_getsecctx hooksinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +1 more+18 -120 replies
40/58LSM: Use lsm_context in inode_notifysecctx hooksinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +1 more+13 -80 replies
41/58LSM: Use lsm_context in dentry_init_security hooksinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c+15 -100 replies
42/58LSM: Use lsm_context in security_dentry_init_securityfs/nfs/nfs4proc.c include/linux/security.h security/security.c+11 -150 replies
43/58LSM: Use lsm_context in security_inode_notifysecctxfs/kernfs/inode.c fs/nfs/inode.c include/linux/security.h +1 more+13 -120 replies
44/58LSM: Use lsm_context in security_inode_getsecctxfs/kernfs/inode.c fs/nfsd/nfs4xdr.c include/linux/security.h +1 more+16 -250 replies
45/58LSM: Use lsm_context in security_secctx_to_secidinclude/linux/security.h kernel/cred.c net/netfilter/nft_meta.c +3 more+24 -220 replies
46/58LSM: Use lsm_context in release_secctx hooksinclude/linux/lsm_hooks.h security/apparmor/include/secid.h security/apparmor/secid.c +3 more+13 -102 replies
47/58LSM: Use lsm_context in security_release_secctxdrivers/android/binder.c fs/kernfs/dir.c fs/kernfs/inode.c +13 more+109 -1150 replies
48/58LSM: Use lsm_context in security_secid_to_secctxdrivers/android/binder.c include/linux/security.h include/net/scm.h +12 more+37 -480 replies
49/58fs: remove lsm_context scaffoldingfs/kernfs/dir.c fs/kernfs/inode.c fs/kernfs/kernfs-internal.h +5 more+43 -560 replies
50/58LSM: 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

Reviews trailers per patch

8 of 67 patches have a Reviewed-by or Acked-by.

PatchKees Cook
1/58R-b
1/58R-b
2/58R-b
2/58R-b
3/58R-b
3/58R-b
4/58R-b
4/58R-b
5/58
5/58
6/58
6/58
7/58
7/58
8/58
8/58
9/58
9/58
10/58
10/58
11/58
11/58
12/58
12/58
13/58
13/58
14/58
14/58
15/58
15/58
16/58
16/58
17/58
17/58
18/58
19/58
20/58
21/58
22/58
23/58
24/58
25/58
26/58
27/58
28/58
29/58
30/58
31/58
32/58
33/58
34/58
35/58
36/58
37/58
38/58
39/58
40/58
41/58
42/58
43/58
44/58
45/58
46/58
47/58
48/58
49/58
50/58

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/58] LSM: Module stacking for AppArmor

This patchset provides the changes required for the AppArmor 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.

https://github.com/cschaufler/lsm-stacking.git#stack-5.2-v1-apparmor

---
 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               |  91 +++++----
 include/linux/nfs4.h                    |   8 +-
 include/linux/security.h                | 133 +++++++++----
 include/net/af_unix.h                   |   2 +-
 include/net/netlabel.h                  |  10 +-
 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                  |  12 +-
 net/netfilter/nf_conntrack_netlink.c    |  29 ++-
 net/netfilter/nf_conntrack_standalone.c |  16 +-
 net/netfilter/nfnetlink_queue.c         |  38 ++--
 net/netfilter/nft_meta.c                |  13 +-
 net/netfilter/xt_SECMARK.c              |  14 +-
 net/netlabel/netlabel_kapi.c            |   5 +-
 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                     | 338 +++++++++++++++++++++++++++-----
 security/selinux/hooks.c                | 259 ++++++++++++------------
 security/selinux/include/audit.h        |   5 +-
 security/selinux/include/objsec.h       |  42 +++-
 security/selinux/netlabel.c             |  25 +--
 security/selinux/ss/services.c          |  18 +-
 security/smack/smack.h                  |  18 ++
 security/smack/smack_lsm.c              | 238 +++++++++++-----------
 security/smack/smack_netfilter.c        |   8 +-
 security/smack/smackfs.c                |  12 +-
 58 files changed, 1217 insertions(+), 779 deletions(-)