Skip to content

LSM: Module stacking for AppArmor

Casey Schaufler linux-security-module selinux 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest40 of 59 patches 0 repliesNew

40 of 59 patches are in this archive. The cover letter announces 59.

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/59LSM: Infrastructure management of the superblockinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +4 more+85 -700 replies
2/59LSM: 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/59LSM: Infrastructure management of the key security blobinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +3 more+75 -360 replies
4/59LSM: Create an lsm_export data structure.include/linux/security.h+12 -00 replies
5/59LSM: 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/59LSM: 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/59LSM: 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/59LSM: 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/59LSM: 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/59LSM: 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/59LSM: Fix logical operation in lsm_export checkssecurity/selinux/include/objsec.h security/smack/smack_lsm.c+2 -20 replies
12/59LSM: 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/59LSM: 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/59LSM: Use lsm_export in security_audit_rule_matchinclude/linux/security.h kernel/auditfilter.c kernel/auditsc.c +2 more+63 -550 replies
15/59LSM: Use lsm_export in security_kernel_act_asinclude/linux/cred.h include/linux/security.h kernel/cred.c +1 more+13 -130 replies
16/59LSM: 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/59LSM: 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/59LSM: 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/59LSM: Use lsm_export in security_ipc_getsecidinclude/linux/security.h kernel/auditsc.c security/security.c+10 -90 replies
20/59LSM: Use lsm_export in security_task_getseciddrivers/android/binder.c include/linux/security.h kernel/audit.c +7 more+44 -300 replies
21/59LSM: 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/59LSM: Use lsm_export in security_cred_getsecidinclude/linux/security.h security/integrity/ima/ima_main.c security/security.c+6 -70 replies
23/59Audit: Change audit_sig_sid to audit_sig_lsminclude/linux/security.h kernel/audit.c kernel/audit.h +1 more+17 -130 replies
24/59Audit: Convert target_sid to an lsm_export structurekernel/audit.h kernel/auditsc.c+14 -190 replies
25/59Audit: Convert osid to an lsm_export structurekernel/audit.c kernel/audit.h kernel/auditsc.c+15 -290 replies
26/59IMA: 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/59NET: Store LSM access information in the socket blob for UDSinclude/linux/security.h net/unix/af_unix.c security/security.c+43 -80 replies
28/59NET: Remove scaffolding on secmarksnet/netfilter/xt_SECMARK.c+7 -10 replies
29/59NET: Remove scaffolding on new secmarksnet/netfilter/nft_meta.c+7 -10 replies
30/59NET: 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/59Netlabel: Replace secids with lsm_exportinclude/net/netlabel.h net/ipv4/cipso_ipv4.c net/netlabel/netlabel_kapi.c +8 more+64 -710 replies
32/59LSM: Remove lsm_export scaffolding functionsinclude/linux/security.h+0 -430 replies
33/59IMA: FIXUP prototype using lsm_exportsecurity/integrity/ima/ima.h+2 -20 replies
34/59Smack: Restore the release_secctx hooksecurity/smack/smack_lsm.c+5 -30 replies
35/59AppArmor: Remove unnecessary hook stubsecurity/apparmor/lsm.c+2 -100 replies
36/59LSM: Limit calls to certain module hookssecurity/security.c+28 -40 replies
37/59LSM: Create a data structure for a security contextinclude/linux/security.h+11 -00 replies
38/59LSM: 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/59LSM: 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/59LSM: Use lsm_context in inode_getsecctx hooksinclude/linux/lsm_hooks.h security/security.c security/selinux/hooks.c +1 more+17 -110 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/59] LSM: Module stacking for AppArmor

This patchset provides the changes required for the AppArmor security module to stack safely with "exclusive" security modules, those being SELinux and Smack.

Performance: Using a kernel compile benchmark indicates a performance impact of 0.15% for a Fedora 29 system with SELinux. Adding AppArmor has an additional 0.20% impact. Fedora does not include an AppArmor profile.

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.

The security module stacking issues around netlabel not addressed here as they are beyond what is required to stack AppArmor with either SELinux or Smack.

git://github.com/cschaufler/lsm-stacking.git#stack-5.1-rc2-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               |  93 ++++----
 include/linux/nfs4.h                    |   8 +-
 include/linux/security.h                | 137 ++++++++----
 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                      |  11 +-
 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                     | 366 ++++++++++++++++++++++++++++----
 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 +-
 57 files changed, 1252 insertions(+), 781 deletions(-)