LSM: Module stacking for AppArmor
Subsystems (18)
Casey Schaufler
maintainerv2 cover LSM: Module stacking for AppArmor
This patchset provides the changes required for the AppArmor security module to stack safely with any other.
Patches 0001-0003 complete the process of moving managment of security blobs that might be shared from the individual modules to the infrastructure.
Patches 0004-0014 replace system use of a "secid" with a structure "lsmblob" containing information from the security modules to be held and reused later. At this point lsmblob contains an array of u32 secids, one "slot" for each of the security modules compiled into the kernel that used secids. A "slot" is allocated when a security module registers a hook for one of the interfaces that uses a secid or a security context. The infrastructure is changed to use the slot number to pass the correct secid to or from the security module hooks.
It is important that the lsmblob be a fixed size entity that does not have to be allocated. Several of the places where it is used would have performance and/or locking issues with dynamic allocation.
Patch 0015 provides a mechanism for a process to identify which security module's hooks should be used when displaying or converting a security context string. A new interface /proc/.../attr/display contains the name of the security module to show. Reading from this file will present the name of the module, while writing to it will set the value. Only names of active security modules are accepted. Internally, the name is translated to the appropriate "slot" number for the module which is then stored in the task security blob.
Patch 0016 Starts the process of changing how a security context is represented. Since it is possible for a security context to have been generated by more than one security module it is now necessary to note which module created a security context so that the correct "release" hook can be called. There are several places where the module that created a security context cannot be inferred.
This is achieved by introducing a "lsmcontext" structure which contains the context string, its length and the "slot" number of the security module that created it. The security_release_secctx() interface is changed, replacing the (string,len) pointer pair with a lsmcontext pointer.
Patches 0012-0021 convert the security interfaces from (string,len) pointer pairs to a lsmcontext pointer. The slot number identifying the creating module is added by the infrastructure. Where the security context is stored for extended periods the data type is changed.
Patch 0022 provides a simple way for a security module to know its "slot" number. The security_add_hooks() initialization function returns the slot number, and the security module need but stash the value for later use, as is required by the Netlabel subsystem. The Netlabel code is converted to save lsmblob structures instead of secids in Patch 0023.
Patch 0024 allows for an error return of -ENOPROTOOPT to be ignored while processing security_getprocattr().
Finally, with all interference on the AppArmor hooks removed, Patch 0025 removes the exclusive bit from them.
The Ubuntu project is using an earlier version of this patchset in their distribution to enable stacking for containers.
Performance measurements to date have the change within the "noise". Better benchmarks are in the works.
https://github.com/cschaufler/lsm-stacking.git#stack-5.2-v4-apparmor
--- drivers/android/binder.c | 24 +- fs/kernfs/dir.c | 5 +- fs/kernfs/inode.c | 35 ++- fs/kernfs/kernfs-internal.h | 3 +- fs/nfs/nfs4proc.c | 22 +- fs/nfsd/nfs4xdr.c | 20 +- fs/proc/base.c | 1 + include/linux/cred.h | 3 +- include/linux/lsm_hooks.h | 8 +- include/linux/security.h | 163 ++++++++++--- include/net/af_unix.h | 2 +- include/net/netlabel.h | 8 +- include/net/scm.h | 14 +- kernel/audit.c | 34 +-- kernel/audit.h | 9 +- kernel/auditfilter.c | 6 +- kernel/auditsc.c | 77 +++---- kernel/cred.c | 12 +- net/ipv4/cipso_ipv4.c | 6 +- net/ipv4/ip_sockglue.c | 12 +- net/netfilter/nf_conntrack_netlink.c | 20 +- net/netfilter/nf_conntrack_standalone.c | 11 +- net/netfilter/nfnetlink_queue.c | 26 ++- net/netfilter/nft_meta.c | 13 +- net/netfilter/xt_SECMARK.c | 6 +- net/netlabel/netlabel_kapi.c | 6 +- net/netlabel/netlabel_unlabeled.c | 95 ++++---- net/netlabel/netlabel_unlabeled.h | 2 +- net/netlabel/netlabel_user.c | 13 +- net/netlabel/netlabel_user.h | 6 +- net/unix/af_unix.c | 6 +- security/apparmor/include/net.h | 6 +- security/apparmor/lsm.c | 48 ++-- 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 | 38 ++-- security/integrity/ima/ima_policy.c | 19 +- security/security.c | 392 ++++++++++++++++++++++++++++---- security/selinux/hooks.c | 164 ++++++------- security/selinux/include/objsec.h | 18 ++ security/selinux/include/security.h | 1 + security/selinux/netlabel.c | 25 +- security/selinux/ss/services.c | 7 +- security/smack/smack.h | 19 ++ security/smack/smack_lsm.c | 154 ++++++------- security/smack/smack_netfilter.c | 8 +- security/smack/smackfs.c | 10 +- 48 files changed, 1010 insertions(+), 596 deletions(-)
Casey Schaufler
maintainerPATCH v2 1/25 LSM: Infrastructure management of the superblock
Move management of the superblock->sb_security blob out of the individual security modules and into the security infrastructure. Instead of allocating the blobs from within the modules the modules tell the infrastructure how much space is required, and the space is allocated there.
--- include/linux/lsm_hooks.h | 1 + security/security.c | 46 ++++++++++++++++++++---- security/selinux/hooks.c | 58 ++++++++++++------------------- security/selinux/include/objsec.h | 6 ++++ security/selinux/ss/services.c | 3 +- security/smack/smack.h | 6 ++++ security/smack/smack_lsm.c | 35 +++++-------------- 7 files changed, 85 insertions(+), 70 deletions(-)
include/linux/lsm_hooks.h +1 -0
@@ -2047,6 +2047,7 @@ struct lsm_blob_sizes {int lbs_cred;int lbs_file;int lbs_inode; +int lbs_superblock;int lbs_ipc;int lbs_msg_msg;int lbs_task;
security/security.c +39 -7
75 lines not on this page · raw message
security/selinux/hooks.c +22 -36
188 lines not on this page · raw message
security/selinux/include/objsec.h +6 -0
@@ -188,4 +188,10 @@ static inline struct ipc_security_struct *selinux_ipc( return ipc->security + selinux_blob_sizes.lbs_ipc; } +static inline struct superblock_security_struct *selinux_superblock ( +const struct super_block *superblock) +{ +return superblock->s_security + selinux_blob_sizes.lbs_superblock; +} +#endif /* _SELINUX_OBJSEC_H_ */
security/selinux/ss/services.c +2 -1
@@ -50,6 +50,7 @@#include <linux/audit.h> #include <linux/mutex.h> #include <linux/vmalloc.h> +#include <linux/lsm_hooks.h> #include <net/netlabel.h> #include "flask.h"
@@ -2751,7 +2752,7 @@ int security_fs_use(struct selinux_state *state, struct super_block *sb)struct sidtab *sidtab;int rc =0 ;struct ocontext *c; -struct superblock_security_struct *sbsec = sb->s_security; +struct superblock_security_struct *sbsec =selinux_superblock (sb);const char *fstype = sb->s_type->name;read_lock (&state->ss->policy_rwlock);
security/smack/smack.h +6 -0
@@ -375,6 +375,12 @@ static inline struct smack_known **smack_ipc(const struct kern_ipc_perm *ipc)return ipc->security + smack_blob_sizes.lbs_ipc; } +static inline struct superblock_smack *smack_superblock ( +const struct super_block *superblock) +{ +return superblock->s_security + smack_blob_sizes.lbs_superblock; +} +/* * Is the directory transmuting? */
security/smack/smack_lsm.c +9 -26
@@ -540,12 +540,7 @@ static int smack_syslog(int typefrom_file)*/ static int smack_sb_alloc_security (struct super_block *sb) { -struct superblock_smack *sbsp; - - sbsp =kzalloc (sizeof (struct superblock_smack ),GFP_KERNEL ); - -if (sbsp ==NULL ) -return -ENOMEM ; +struct superblock_smack *sbsp =smack_superblock (sb); sbsp->smk_root = &smack_known_floor; sbsp->smk_default = &smack_known_floor;
@@ -554,22 +549,10 @@ static int smack_sb_alloc_security(struct super_block *sb)/* * SMK_SB_INITIALIZED will be zero from kzalloc. */ - sb->s_security = sbsp;return 0 ; } -/** -* smack_sb_free_security - free a superblock blob -* @sb: the superblock getting the blob -* -*/ -static void smack_sb_free_security (struct super_block *sb) -{ -kfree (sb->s_security); - sb->s_security =NULL ; -} -struct smack_mnt_opts {const char *fsdefault, *fsfloor, *fshat, *fsroot, *fstransmute; };
@@ -781,7 +764,7 @@ static int smack_set_mnt_opts(struct super_block *sb, {struct dentry *root = sb->s_root;struct inode *inode =d_backing_inode (root); -struct superblock_smack *sp = sb->s_security; +struct superblock_smack *sp =smack_superblock (sb);struct inode_smack *isp;struct smack_known *skp;struct smack_mnt_opts *opts = mnt_opts;
@@ -880,7 +863,7 @@ static int smack_set_mnt_opts(struct super_block *sb,*/ static int smack_sb_statfs (struct dentry *dentry) { -struct superblock_smack *sbp = dentry->d_sb->s_security; +struct superblock_smack *sbp =smack_superblock (dentry->d_sb);int rc;struct smk_audit_info ad;
@@ -917,7 +900,7 @@ static int smack_bprm_set_creds(struct linux_binprm *bprm)if (isp->smk_task ==NULL || isp->smk_task == bsp->smk_task)return 0 ; - sbsp = inode->i_sb->s_security; + sbsp =smack_superblock (inode->i_sb);if ((sbsp->smk_flags &SMK_SB_UNTRUSTED ) && isp->smk_task != sbsp->smk_root)return 0 ;
@@ -1168,7 +1151,7 @@ static int smack_inode_rename(struct inode *old_inode,*/ static int smack_inode_permission (struct inode *inode,int mask) { -struct superblock_smack *sbsp = inode->i_sb->s_security; +struct superblock_smack *sbsp =smack_superblock (inode->i_sb);struct smk_audit_info ad;int no_block = mask &MAY_NOT_BLOCK ;int rc;
@@ -1410,7 +1393,7 @@ static int smack_inode_removexattr(struct dentry *dentry, const char *name)*/ if (strcmp (name,XATTR_NAME_SMACK ) ==0 ) {struct super_block *sbp = dentry->d_sb; -struct superblock_smack *sbsp = sbp->s_security; +struct superblock_smack *sbsp =smack_superblock (sbp); isp->smk_inode = sbsp->smk_default; }else if (strcmp (name,XATTR_NAME_SMACKEXEC ) ==0 )
@@ -1680,7 +1663,7 @@ static int smack_mmap_file(struct file *file, isp =smack_inode (file_inode (file));if (isp->smk_mmap ==NULL )return 0 ; - sbsp =file_inode (file)->i_sb->s_security; + sbsp =smack_superblock (file_inode (file)->i_sb);if (sbsp->smk_flags &SMK_SB_UNTRUSTED && isp->smk_mmap != sbsp->smk_root)return -EACCES ;
@@ -3288,7 +3271,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode) goto unlockandout; sbp = inode->i_sb; - sbsp = sbp->s_security; + sbsp =smack_superblock (sbp);/* * We're going to use the superblock default label * if there's no label on the file.
@@ -4575,6 +4558,7 @@ struct lsm_blob_sizes smack_blob_sizes __lsm_ro_after_init = { .lbs_inode = sizeof(struct inode_smack), .lbs_ipc = sizeof(struct smack_known *), .lbs_msg_msg = sizeof(struct smack_known *), + .lbs_superblock = sizeof(struct superblock_smack), }; static struct security_hook_list smack_hooks[] __lsm_ro_after_init = {
@@ -4586,7 +4570,6 @@ static struct security_hook_list smack_hooks[] __lsm_ro_after_init = {LSM_HOOK_INIT (fs_context_parse_param, smack_fs_context_parse_param),LSM_HOOK_INIT (sb_alloc_security, smack_sb_alloc_security), -LSM_HOOK_INIT (sb_free_security, smack_sb_free_security),LSM_HOOK_INIT (sb_free_mnt_opts, smack_free_mnt_opts),LSM_HOOK_INIT (sb_eat_lsm_opts, smack_sb_eat_lsm_opts), LSM_HOOK_INIT(sb_statfs, smack_sb_statfs),
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 2/25 LSM: Infrastructure management of the sock security
In reply to Casey SchauflerMove management of the sock->sk_security blob out of the individual security modules and into the security infrastructure. Instead of allocating the blobs from within the modules the modules tell the infrastructure how much space is required, and the space is allocated there.
--- include/linux/lsm_hooks.h | 1 + security/apparmor/include/net.h | 6 ++- security/apparmor/lsm.c | 38 ++++----------- security/security.c | 36 +++++++++++++- security/selinux/hooks.c | 78 +++++++++++++++---------------- security/selinux/include/objsec.h | 5 ++ security/selinux/netlabel.c | 23 ++++----- security/smack/smack.h | 5 ++ security/smack/smack_lsm.c | 64 ++++++++++++------------- security/smack/smack_netfilter.c | 8 ++-- 10 files changed, 144 insertions(+), 120 deletions(-)
include/linux/lsm_hooks.h +1 -0
@@ -2047,6 +2047,7 @@ struct lsm_blob_sizes {int lbs_cred;int lbs_file;int lbs_inode; +int lbs_sock;int lbs_superblock;int lbs_ipc;int lbs_msg_msg;
security/apparmor/include/net.h +5 -1
@@ -55,7 +55,11 @@ struct aa_sk_ctx {struct aa_label *peer; }; -#define SK_CTX (X ) ((X)->sk_security) +static inline struct aa_sk_ctx *aa_sock (const struct sock *sk) +{ +return sk->sk_security + apparmor_blob_sizes.lbs_sock; +} +#define SOCK_ctx (X ) SOCK_INODE(X)->i_security#define DEFINE_AUDIT_NET (NAME ,OP ,SK ,F ,T ,P ) \ struct lsm_network_audit NAME ## _net = { .sk = (SK), \
security/apparmor/lsm.c +10 -28
@@ -757,33 +757,15 @@ static int apparmor_task_kill(struct task_struct *target, struct kernel_siginforeturn error; } -/** -* apparmor_sk_alloc_security - allocate and attach the sk_security field -*/ -static int apparmor_sk_alloc_security (struct sock *sk,int family,gfp_t flags) -{ -struct aa_sk_ctx *ctx; - - ctx =kzalloc (sizeof (*ctx), flags); -if (!ctx) -return -ENOMEM ; - -SK_CTX (sk) = ctx; - -return 0 ; -} -/** * apparmor_sk_free_security - free the sk_security field */ static void apparmor_sk_free_security (struct sock *sk) { -struct aa_sk_ctx *ctx =SK_CTX (sk); +struct aa_sk_ctx *ctx =aa_sock (sk); -SK_CTX (sk) =NULL ;aa_put_label (ctx->label);aa_put_label (ctx->peer); -kfree (ctx); }/**
@@ -792,8 +774,8 @@ static void apparmor_sk_free_security(struct sock *sk)static void apparmor_sk_clone_security (const struct sock *sk,struct sock *newsk) { -struct aa_sk_ctx *ctx =SK_CTX (sk); -struct aa_sk_ctx *new =SK_CTX (newsk); +struct aa_sk_ctx *ctx =aa_sock (sk); +struct aa_sk_ctx *new =aa_sock (newsk); new->label =aa_get_label (ctx->label); new->peer =aa_get_label (ctx->peer);
@@ -844,7 +826,7 @@ static int apparmor_socket_post_create(struct socket *sock, int family, label =aa_get_current_label ();if (sock->sk) { -struct aa_sk_ctx *ctx =SK_CTX (sock->sk); +struct aa_sk_ctx *ctx =aa_sock (sock->sk);aa_put_label (ctx->label); ctx->label =aa_get_label (label);
@@ -1029,7 +1011,7 @@ static int apparmor_socket_shutdown(struct socket *sock, int how)*/ static int apparmor_socket_sock_rcv_skb (struct sock *sk,struct sk_buff *skb) { -struct aa_sk_ctx *ctx =SK_CTX (sk); +struct aa_sk_ctx *ctx =aa_sock (sk);if (!skb->secmark)return 0 ;
@@ -1042,7 +1024,7 @@ static int apparmor_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)static struct aa_label *sk_peer_label (struct sock *sk) { -struct aa_sk_ctx *ctx =SK_CTX (sk); +struct aa_sk_ctx *ctx =aa_sock (sk);if (ctx->peer)return ctx->peer;
@@ -1126,7 +1108,7 @@ static int apparmor_socket_getpeersec_dgram(struct socket *sock,*/ static void apparmor_sock_graft (struct sock *sk,struct socket *parent) { -struct aa_sk_ctx *ctx =SK_CTX (sk); +struct aa_sk_ctx *ctx =aa_sock (sk);if (!ctx->label) ctx->label =aa_get_current_label ();
@@ -1136,7 +1118,7 @@ static void apparmor_sock_graft(struct sock *sk, struct socket *parent)static int apparmor_inet_conn_request (struct sock *sk,struct sk_buff *skb,struct request_sock *req) { -struct aa_sk_ctx *ctx =SK_CTX (sk); +struct aa_sk_ctx *ctx =aa_sock (sk);if (!skb->secmark)return 0 ;
@@ -1153,6 +1135,7 @@ struct lsm_blob_sizes apparmor_blob_sizes __lsm_ro_after_init = { .lbs_cred = sizeof(struct aa_task_ctx *), .lbs_file = sizeof(struct aa_file_ctx), .lbs_task = sizeof(struct aa_task_ctx), + .lbs_sock = sizeof(struct aa_sk_ctx), }; static struct security_hook_list apparmor_hooks[] __lsm_ro_after_init = {
@@ -1189,7 +1172,6 @@ static struct security_hook_list apparmor_hooks[] __lsm_ro_after_init = {LSM_HOOK_INIT (getprocattr, apparmor_getprocattr),LSM_HOOK_INIT (setprocattr, apparmor_setprocattr), -LSM_HOOK_INIT (sk_alloc_security, apparmor_sk_alloc_security),LSM_HOOK_INIT (sk_free_security, apparmor_sk_free_security), LSM_HOOK_INIT(sk_clone_security, apparmor_sk_clone_security),
@@ -1581,7 +1563,7 @@ static unsigned int apparmor_ip_postroute(void *priv,if (sk ==NULL )return NF_ACCEPT ; - ctx =SK_CTX (sk); + ctx =aa_sock (sk);if (!apparmor_secmark_check (ctx->label,OP_SENDMSG ,AA_MAY_SEND , skb->secmark, sk))return NF_ACCEPT ;
security/security.c +35 -1
@@ -32,6 +32,7 @@#include <linux/string.h> #include <linux/msg.h> #include <net/flow.h> +#include <net/sock.h> #define MAX_LSM_EVM_XATTR 2
@@ -172,6 +173,7 @@ static void __init lsm_set_blob_sizes(struct lsm_blob_sizes *needed)lsm_set_blob_size (&needed->lbs_inode, &blob_sizes.lbs_inode);lsm_set_blob_size (&needed->lbs_ipc, &blob_sizes.lbs_ipc);lsm_set_blob_size (&needed->lbs_msg_msg, &blob_sizes.lbs_msg_msg); +lsm_set_blob_size (&needed->lbs_sock, &blob_sizes.lbs_sock);lsm_set_blob_size (&needed->lbs_superblock, &blob_sizes.lbs_superblock);lsm_set_blob_size (&needed->lbs_task, &blob_sizes.lbs_task); }
@@ -306,6 +308,7 @@ static void __init ordered_lsm_init(void)init_debug ("inode blob size = %d\n" , blob_sizes.lbs_inode);init_debug ("ipc blob size = %d\n" , blob_sizes.lbs_ipc);init_debug ("msg_msg blob size = %d\n" , blob_sizes.lbs_msg_msg); +init_debug ("sock blob size = %d\n" , blob_sizes.lbs_sock);init_debug ("superblock blob size = %d\n" , blob_sizes.lbs_superblock);init_debug ("task blob size = %d\n" , blob_sizes.lbs_task);
@@ -605,6 +608,28 @@ static void __init lsm_early_task(struct task_struct *task)panic ("%s: Early task alloc failed.\n" , __func__); } +/** +* lsm_sock_alloc - allocate a composite sock blob +* @sock: the sock that needs a blob +* @priority: allocation mode +* +* Allocate the sock blob for all the modules +* +* Returns 0, or -ENOMEM if memory can't be allocated. +*/ +int lsm_sock_alloc (struct sock *sock,gfp_t priority) +{ +if (blob_sizes.lbs_sock ==0 ) { + sock->sk_security =NULL ; +return 0 ; + } + + sock->sk_security =kzalloc (blob_sizes.lbs_sock, priority); +if (sock->sk_security ==NULL ) +return -ENOMEM ; +return 0 ; +} +/** * lsm_superblock_alloc - allocate a composite superblock blob * @sb: the superblock that needs a blob
@@ -2048,12 +2073,21 @@ EXPORT_SYMBOL(security_socket_getpeersec_dgram);int security_sk_alloc (struct sock *sk,int family,gfp_t priority) { -return call_int_hook (sk_alloc_security,0 , sk, family, priority); +int rc =lsm_sock_alloc (sk, priority); + +if (unlikely (rc)) +return rc; + rc =call_int_hook (sk_alloc_security,0 , sk, family, priority); +if (unlikely (rc)) +security_sk_free (sk); +return rc; }void security_sk_free (struct sock *sk) {call_void_hook (sk_free_security, sk); +kfree (sk->sk_security); + sk->sk_security =NULL ; }void security_sk_clone (const struct sock *sk,struct sock *newsk)
security/selinux/hooks.c +37 -41
249 lines not on this page · raw message
security/selinux/include/objsec.h +5 -0
@@ -194,4 +194,9 @@ static inline struct superblock_security_struct *selinux_superblock( return superblock->s_security + selinux_blob_sizes.lbs_superblock; } +static inline struct sk_security_struct *selinux_sock (const struct sock *sock) +{ +return sock->sk_security + selinux_blob_sizes.lbs_sock; +} +#endif /* _SELINUX_OBJSEC_H_ */
security/selinux/netlabel.c +12 -11
@@ -31,6 +31,7 @@#include <linux/gfp.h> #include <linux/ip.h> #include <linux/ipv6.h> +#include <linux/lsm_hooks.h> #include <net/sock.h> #include <net/netlabel.h> #include <net/ip.h>
@@ -81,7 +82,7 @@ static int selinux_netlbl_sidlookup_cached(struct sk_buff *skb,static struct netlbl_lsm_secattr *selinux_netlbl_sock_genattr (struct sock *sk) {int rc; -struct sk_security_struct *sksec = sk->sk_security; +struct sk_security_struct *sksec =selinux_sock (sk);struct netlbl_lsm_secattr *secattr;if (sksec->nlbl_secattr !=NULL )
@@ -114,7 +115,7 @@ static struct netlbl_lsm_secattr *selinux_netlbl_sock_getattr( const struct sock *sk, u32 sid) { -struct sk_security_struct *sksec = sk->sk_security; +struct sk_security_struct *sksec =selinux_sock (sk);struct netlbl_lsm_secattr *secattr = sksec->nlbl_secattr;if (secattr ==NULL )
@@ -249,7 +250,7 @@ int selinux_netlbl_skbuff_setsid(struct sk_buff *skb,* being labeled by it's parent socket, if it is just exit */ sk =skb_to_full_sk (skb);if (sk !=NULL ) { -struct sk_security_struct *sksec = sk->sk_security; +struct sk_security_struct *sksec =selinux_sock (sk);if (sksec->nlbl_state !=NLBL_REQSKB )return 0 ;
@@ -287,7 +288,7 @@ int selinux_netlbl_sctp_assoc_request(struct sctp_endpoint *ep, {int rc;struct netlbl_lsm_secattr secattr; -struct sk_security_struct *sksec = ep->base.sk->sk_security; +struct sk_security_struct *sksec =selinux_sock (ep->base.sk);struct sockaddr *addr;struct sockaddr_in addr4;#if IS_ENABLED (CONFIG_IPV6 )
@@ -370,7 +371,7 @@ int selinux_netlbl_inet_conn_request(struct request_sock *req, u16 family)*/ void selinux_netlbl_inet_csk_clone (struct sock *sk,u16 family) { -struct sk_security_struct *sksec = sk->sk_security; +struct sk_security_struct *sksec =selinux_sock (sk);if (family ==PF_INET ) sksec->nlbl_state =NLBL_LABELED ;
@@ -388,8 +389,8 @@ void selinux_netlbl_inet_csk_clone(struct sock *sk, u16 family)*/ void selinux_netlbl_sctp_sk_clone (struct sock *sk,struct sock *newsk) { -struct sk_security_struct *sksec = sk->sk_security; -struct sk_security_struct *newsksec = newsk->sk_security; +struct sk_security_struct *sksec =selinux_sock (sk); +struct sk_security_struct *newsksec =selinux_sock (newsk); newsksec->nlbl_state = sksec->nlbl_state; }
@@ -407,7 +408,7 @@ void selinux_netlbl_sctp_sk_clone(struct sock *sk, struct sock *newsk)int selinux_netlbl_socket_post_create (struct sock *sk,u16 family) {int rc; -struct sk_security_struct *sksec = sk->sk_security; +struct sk_security_struct *sksec =selinux_sock (sk);struct netlbl_lsm_secattr *secattr;if (family !=PF_INET && family !=PF_INET6 )
@@ -522,7 +523,7 @@ int selinux_netlbl_socket_setsockopt(struct socket *sock, {int rc =0 ;struct sock *sk = sock->sk; -struct sk_security_struct *sksec = sk->sk_security; +struct sk_security_struct *sksec =selinux_sock (sk);struct netlbl_lsm_secattr secattr; if (selinux_netlbl_option(level, optname) &&
@@ -560,7 +561,7 @@ static int selinux_netlbl_socket_connect_helper(struct sock *sk, struct sockaddr *addr) {int rc; -struct sk_security_struct *sksec = sk->sk_security; +struct sk_security_struct *sksec =selinux_sock (sk);struct netlbl_lsm_secattr *secattr;/* connected sockets are allowed to disconnect when the address family
@@ -599,7 +600,7 @@ static int selinux_netlbl_socket_connect_helper(struct sock *sk,int selinux_netlbl_socket_connect_locked (struct sock *sk,struct sockaddr *addr) { -struct sk_security_struct *sksec = sk->sk_security; +struct sk_security_struct *sksec =selinux_sock (sk);if (sksec->nlbl_state !=NLBL_REQSKB && sksec->nlbl_state !=NLBL_CONNLABELED )
security/smack/smack.h +5 -0
@@ -375,6 +375,11 @@ static inline struct smack_known **smack_ipc(const struct kern_ipc_perm *ipc)return ipc->security + smack_blob_sizes.lbs_ipc; } +static inline struct socket_smack *smack_sock (const struct sock *sock) +{ +return sock->sk_security + smack_blob_sizes.lbs_sock; +} +static inline struct superblock_smack *smack_superblock (const struct super_block *superblock) {
security/smack/smack_lsm.c +30 -34
225 lines not on this page · raw message
security/smack/smack_netfilter.c +4 -4
@@ -31,8 +31,8 @@ static unsigned int smack_ipv6_output(void *priv,struct socket_smack *ssp;struct smack_known *skp; -if (sk && sk->sk_security) { - ssp = sk->sk_security; +if (sk &&smack_sock (sk)) { + ssp =smack_sock (sk); skp = ssp->smk_out; skb->secmark = skp->smk_secid; }
@@ -49,8 +49,8 @@ static unsigned int smack_ipv4_output(void *priv,struct socket_smack *ssp;struct smack_known *skp; -if (sk && sk->sk_security) { - ssp = sk->sk_security; +if (sk &&smack_sock (sk)) { + ssp =smack_sock (sk); skp = ssp->smk_out; skb->secmark = skp->smk_secid; }
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 3/25 LSM: Infrastructure management of the key blob
In reply to Casey SchauflerFrom: Casey Schaufler <[email protected]>
Move management of the key->security blob out of the individual security modules and into the security infrastructure. Instead of allocating the blobs from within the modules the modules tell the infrastructure how much space is required, and the space is allocated there.
--- include/linux/lsm_hooks.h | 1 + security/security.c | 40 ++++++++++++++++++++++++++++++- security/selinux/hooks.c | 23 +++++------------- security/selinux/include/objsec.h | 7 ++++++ security/smack/smack.h | 7 ++++++ security/smack/smack_lsm.c | 33 ++++++++++++------------- 6 files changed, 75 insertions(+), 36 deletions(-)
include/linux/lsm_hooks.h +1 -0
@@ -2050,6 +2050,7 @@ struct lsm_blob_sizes {int lbs_sock;int lbs_superblock;int lbs_ipc; +int lbs_key;int lbs_msg_msg;int lbs_task; };
security/security.c +39 -1
@@ -172,6 +172,9 @@ static void __init lsm_set_blob_sizes(struct lsm_blob_sizes *needed) blob_sizes.lbs_inode =sizeof (struct rcu_head );lsm_set_blob_size (&needed->lbs_inode, &blob_sizes.lbs_inode);lsm_set_blob_size (&needed->lbs_ipc, &blob_sizes.lbs_ipc); +#ifdef CONFIG_KEYS +lsm_set_blob_size (&needed->lbs_key, &blob_sizes.lbs_key); +#endif lsm_set_blob_size (&needed->lbs_msg_msg, &blob_sizes.lbs_msg_msg);lsm_set_blob_size (&needed->lbs_sock, &blob_sizes.lbs_sock);lsm_set_blob_size (&needed->lbs_superblock, &blob_sizes.lbs_superblock);
@@ -307,6 +310,9 @@ static void __init ordered_lsm_init(void)init_debug ("file blob size = %d\n" , blob_sizes.lbs_file);init_debug ("inode blob size = %d\n" , blob_sizes.lbs_inode);init_debug ("ipc blob size = %d\n" , blob_sizes.lbs_ipc); +#ifdef CONFIG_KEYS +init_debug ("key blob size = %d\n" , blob_sizes.lbs_key); +#endif /* CONFIG_KEYS */ init_debug ("msg_msg blob size = %d\n" , blob_sizes.lbs_msg_msg);init_debug ("sock blob size = %d\n" , blob_sizes.lbs_sock);init_debug ("superblock blob size = %d\n" , blob_sizes.lbs_superblock);
@@ -573,6 +579,29 @@ static int lsm_ipc_alloc(struct kern_ipc_perm *kip)return 0 ; } +#ifdef CONFIG_KEYS +/** +* lsm_key_alloc - allocate a composite key blob +* @key: the key that needs a blob +* +* Allocate the key blob for all the modules +* +* Returns 0, or -ENOMEM if memory can't be allocated. +*/ +int lsm_key_alloc (struct key *key) +{ +if (blob_sizes.lbs_key ==0 ) { + key->security =NULL ; +return 0 ; + } + + key->security =kzalloc (blob_sizes.lbs_key,GFP_KERNEL ); +if (key->security ==NULL ) +return -ENOMEM ; +return 0 ; +} +#endif /* CONFIG_KEYS */ +/** * lsm_msg_msg_alloc - allocate a composite msg_msg blob * @mp: the msg_msg that needs a blob
@@ -2339,12 +2368,21 @@ EXPORT_SYMBOL(security_skb_classify_flow);int security_key_alloc (struct key *key,const struct cred *cred,unsigned long flags) { -return call_int_hook (key_alloc,0 , key, cred, flags); +int rc =lsm_key_alloc (key); + +if (unlikely (rc)) +return rc; + rc =call_int_hook (key_alloc,0 , key, cred, flags); +if (unlikely (rc)) +security_key_free (key); +return rc; }void security_key_free (struct key *key) {call_void_hook (key_free, key); +kfree (key->security); + key->security =NULL ; } int security_key_permission(key_ref_t key_ref,
security/selinux/hooks.c +6 -17
@@ -6353,11 +6353,7 @@ static int selinux_key_alloc(struct key *k, const struct cred *cred, unsigned long flags) {const struct task_security_struct *tsec; -struct key_security_struct *ksec; - - ksec =kzalloc (sizeof (struct key_security_struct ),GFP_KERNEL ); -if (!ksec) -return -ENOMEM ; +struct key_security_struct *ksec =selinux_key (k); tsec =selinux_cred (cred);if (tsec->keycreate_sid)
@@ -6365,18 +6361,9 @@ static int selinux_key_alloc(struct key *k, const struct cred *cred,else ksec->sid = tsec->sid; - k->security = ksec;return 0 ; } -static void selinux_key_free (struct key *k) -{ -struct key_security_struct *ksec = k->security; - - k->security =NULL ; -kfree (ksec); -} -static int selinux_key_permission (key_ref_t key_ref,const struct cred *cred,unsigned perm)
@@ -6394,7 +6381,7 @@ static int selinux_key_permission(key_ref_t key_ref, sid =cred_sid (cred); key =key_ref_to_ptr (key_ref); - ksec = key->security; + ksec =selinux_key (key);return avc_has_perm (&selinux_state, sid, ksec->sid,SECCLASS_KEY , perm,NULL );
@@ -6402,7 +6389,7 @@ static int selinux_key_permission(key_ref_t key_ref,static int selinux_key_getsecurity (struct key *key,char **_buffer) { -struct key_security_struct *ksec = key->security; +struct key_security_struct *ksec =selinux_key (key);char *context =NULL ;unsigned len;int rc;
@@ -6627,6 +6614,9 @@ struct lsm_blob_sizes selinux_blob_sizes __lsm_ro_after_init = { .lbs_file = sizeof(struct file_security_struct), .lbs_inode = sizeof(struct inode_security_struct), .lbs_ipc =sizeof (struct ipc_security_struct ), +#ifdef CONFIG_KEYS + .lbs_key = sizeof(struct key_security_struct), +#endif /* CONFIG_KEYS */ .lbs_msg_msg =sizeof (struct msg_security_struct ), .lbs_sock = sizeof(struct sk_security_struct), .lbs_superblock = sizeof(struct superblock_security_struct),
@@ -6842,7 +6832,6 @@ static struct security_hook_list selinux_hooks[] __lsm_ro_after_init = {#ifdef CONFIG_KEYS LSM_HOOK_INIT (key_alloc, selinux_key_alloc), -LSM_HOOK_INIT (key_free, selinux_key_free),LSM_HOOK_INIT (key_permission, selinux_key_permission), LSM_HOOK_INIT(key_getsecurity, selinux_key_getsecurity), #endif
security/selinux/include/objsec.h +7 -0
@@ -194,6 +194,13 @@ static inline struct superblock_security_struct *selinux_superblock(return superblock->s_security + selinux_blob_sizes.lbs_superblock; } +#ifdef CONFIG_KEYS +static inline struct key_security_struct *selinux_key (const struct key *key) +{ +return key->security + selinux_blob_sizes.lbs_key; +} +#endif /* CONFIG_KEYS */ +static inline struct sk_security_struct *selinux_sock (const struct sock *sock) {return sock->sk_security + selinux_blob_sizes.lbs_sock;
security/smack/smack.h +7 -0
@@ -386,6 +386,13 @@ static inline struct superblock_smack *smack_superblock(return superblock->s_security + smack_blob_sizes.lbs_superblock; } +#ifdef CONFIG_KEYS +static inline struct smack_known **smack_key (const struct key *key) +{ +return key->security + smack_blob_sizes.lbs_key; +} +#endif /* CONFIG_KEYS */ +/* * Is the directory transmuting? */
security/smack/smack_lsm.c +15 -18
@@ -4179,23 +4179,13 @@ static void smack_inet_csk_clone(struct sock *sk,static int smack_key_alloc (struct key *key,const struct cred *cred,unsigned long flags) { +struct smack_known **blob =smack_key (key);struct smack_known *skp =smk_of_task (smack_cred (cred)); - key->security = skp; + *blob = skp;return 0 ; } -/** -* smack_key_free - Clear the key security blob -* @key: the object -* -* Clear the blob pointer -*/ -static void smack_key_free (struct key *key) -{ - key->security =NULL ; -} -/** * smack_key_permission - Smack access on a key * @key_ref: gets to the object
@@ -4208,6 +4198,8 @@ static void smack_key_free(struct key *key)static int smack_key_permission (key_ref_t key_ref,const struct cred *cred,unsigned perm) { +struct smack_known **blob; +struct smack_known *skp;struct key *keyp;struct smk_audit_info ad;struct smack_known *tkp =smk_of_task (smack_cred (cred));
@@ -4227,7 +4219,9 @@ static int smack_key_permission(key_ref_t key_ref,* If the key hasn't been initialized give it access so that * it may do so. */ -if (keyp->security ==NULL ) + blob =smack_key (keyp); + skp = *blob; +if (skp ==NULL )return 0 ;/* * This should not occur
@@ -4247,8 +4241,8 @@ static int smack_key_permission(key_ref_t key_ref, request |=MAY_READ ;if (perm & (KEY_NEED_WRITE |KEY_NEED_LINK |KEY_NEED_SETATTR )) request |=MAY_WRITE ; - rc =smk_access (tkp, keyp->security, request, &ad); - rc =smk_bu_note ("key access" , tkp, keyp->security, request, rc); + rc =smk_access (tkp, skp, request, &ad); + rc =smk_bu_note ("key access" , tkp, skp, request, rc);return rc; }
@@ -4263,11 +4257,12 @@ static int smack_key_permission(key_ref_t key_ref,*/ static int smack_key_getsecurity (struct key *key,char **_buffer) { -struct smack_known *skp = key->security; +struct smack_known **blob =smack_key (key); +struct smack_known *skp = *blob;size_t length;char *copy; -if (key->security ==NULL ) { +if (skp ==NULL ) { *_buffer =NULL ;return 0 ; }
@@ -4550,6 +4545,9 @@ struct lsm_blob_sizes smack_blob_sizes __lsm_ro_after_init = { .lbs_file = sizeof(struct smack_known *), .lbs_inode = sizeof(struct inode_smack), .lbs_ipc =sizeof (struct smack_known *), +#ifdef CONFIG_KEYS + .lbs_key = sizeof(struct smack_known *), +#endif /* CONFIG_KEYS */ .lbs_msg_msg =sizeof (struct smack_known *), .lbs_sock = sizeof(struct socket_smack), .lbs_superblock = sizeof(struct superblock_smack),
@@ -4671,7 +4669,6 @@ static struct security_hook_list smack_hooks[] __lsm_ro_after_init = {/* key management security hooks */ #ifdef CONFIG_KEYS LSM_HOOK_INIT (key_alloc, smack_key_alloc), -LSM_HOOK_INIT (key_free, smack_key_free),LSM_HOOK_INIT (key_permission, smack_key_permission), LSM_HOOK_INIT(key_getsecurity, smack_key_getsecurity), #endif /* CONFIG_KEYS */
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 4/25 LSM: Create and manage the lsmblob data structure.
In reply to Casey SchauflerWhen more than one security module is exporting data to audit and networking sub-systems a single 32 bit integer is no longer sufficient to represent the data. Add a structure to be used instead.
The lsmblob structure is currently an array of u32 "secids". There is an entry for each of the security modules built into the system that would use secids if active. The system assigns the module a "slot" when it registers hooks. If modules are compiled in but not registered there will be unused slots.
--- include/linux/lsm_hooks.h | 1 + include/linux/security.h | 62 +++++++++++++++++++++++++++++++++++++++ security/security.c | 31 ++++++++++++++++++++ 3 files changed, 94 insertions(+)
include/linux/lsm_hooks.h +1 -0
@@ -2038,6 +2038,7 @@ struct security_hook_list {struct hlist_head *head;union security_list_options hook;char *lsm; +int slot; } __randomize_layout;/*
include/linux/security.h +62 -0
68 lines not on this page · raw message
security/security.c +31 -0
@@ -317,6 +317,7 @@ static void __init ordered_lsm_init(void)init_debug ("sock blob size = %d\n" , blob_sizes.lbs_sock);init_debug ("superblock blob size = %d\n" , blob_sizes.lbs_superblock);init_debug ("task blob size = %d\n" , blob_sizes.lbs_task); +init_debug ("lsmblob size = %lu\n" ,sizeof (struct lsmblob ));/* * Create any kmem_caches needed for blobs
@@ -420,6 +421,11 @@ static int lsm_append(char *new, char **result)return 0 ; } +/* +* Current index to use while initializing the lsmblob secid list. +*/ +static int lsm_slot__initdata ; +/** * security_add_hooks - Add a modules hooks to the hook lists. * @hooks: the hooks to add
@@ -427,15 +433,40 @@ static int lsm_append(char *new, char **result)* @lsm: the name of the security module * * Each LSM has to register its hooks with the infrastructure. +* If the LSM is using hooks that export secids allocate a slot +* for it in the lsmblob. */ void __init security_add_hooks (struct security_hook_list *hooks,int count,char *lsm) { +int slot =LSMDATA_INVALID ;int i;for (i =0 ; i < count; i++) { hooks[i].lsm = lsm;hlist_add_tail_rcu (&hooks[i].list, hooks[i].head); +/* +* If this is one of the hooks that uses a secid +* note it so that a slot can in allocated for the +* secid in the lsmblob structure. +*/ +if (hooks[i].head == &security_hook_heads.audit_rule_match || + hooks[i].head == &security_hook_heads.kernel_act_as || + hooks[i].head == + &security_hook_heads.socket_getpeersec_dgram || + hooks[i].head == &security_hook_heads.secctx_to_secid || + hooks[i].head == &security_hook_heads.secid_to_secctx || + hooks[i].head == &security_hook_heads.ipc_getsecid || + hooks[i].head == &security_hook_heads.task_getsecid || + hooks[i].head == &security_hook_heads.inode_getsecid || + hooks[i].head == &security_hook_heads.cred_getsecid) { +if (slot ==LSMDATA_INVALID ) { + slot = lsm_slot++; +init_debug ("%s assigned lsmblob slot %d\n" , + hooks[i].lsm, slot); + } + } + hooks[i].slot = slot; }if (lsm_append (lsm, &lsm_names) <0 )panic ("%s - Cannot get early memory.\n" , __func__);
Signature · 1 line
2.20.1
Re: [PATCH v2 04/25] LSM: Create and manage the lsmblob data structure.
Quoted 25 lines · Casey Schaufler
When more than one security module is exporting data to audit and networking sub-systems a single 32 bit integer is no longer sufficient to represent the data. Add a structure to be used instead.
The lsmblob structure is currently an array of u32 "secids". There is an entry for each of the security modules built into the system that would use secids if active. The system assigns the module a "slot" when it registers hooks. If modules are compiled in but not registered there will be unused slots.
Signed-off-by Casey Schaufler <[email protected]>--- include/linux/lsm_hooks.h | 1 + include/linux/security.h | 62 +++++++++++++++++++++++++++++++++++++++ security/security.c | 31 ++++++++++++++++++++ 3 files changed, 94 insertions(+)include/linux/lsm_hooks.h +0
-0
include/linux/lsm_hooks.h struct security_hook_list { · line 2042
Quoted 5 lines
include/linux/lsm_hooks.h +1
-0@@ -2038,6 +2038,7 @@ struct security_hook_list {struct hlist_head *head;union security_list_options hook;char *lsm; +int slot; } __randomize_layout;
Hm, this feels redundant (as does the existing "char *lsm") now that we have lsm_info. The place for assigned-at-init value is blob_sizes, which hangs off of lsm_info (as does the LSM char *)...
Quoted 7 lines
include/linux/lsm_hooks.h +0
-0/* include/linux/security.h +0
-0
include/linux/security.h enum lsm_event { · line 82
Quoted 7 lines
include/linux/security.h +4
-0@@ -76,6 +76,68 @@ enum lsm_event { LSM_POLICY_CHANGE, }; +/* +* Data exported by the security modules +*/ +#define LSMDATA_ENTRIES ( \
LSMBLOB_ENTRIES?
include/linux/security.h enum lsm_event { · line 89
Quoted 7 lines
include/linux/security.h +7
-0+ (IS_ENABLED(CONFIG_SECURITY_SELINUX) ? 1 : 0) + \ + (IS_ENABLED(CONFIG_SECURITY_SMACK) ? 1 : 0) + \ + (IS_ENABLED(CONFIG_SECURITY_APPARMOR) ? 1 : 0) ) + +struct lsmblob { +u32 secid[LSMDATA_ENTRIES ]; +};
Cool; I like this auto-sizing.
Quoted 6 lines
include/linux/security.h +6
-0+ +#define LSMDATA_INVALID -1 + +/** +* lsmblob_init - initialize an lsmblob structure. +* @l: Pointer to the data to initialize
include/linux/security.h enum lsm_event { · line 105
Quoted 10 lines
include/linux/security.h +10
-0+* @secid: The initial secid value +* +* Set all secid for all modules to the specified value. +*/ +static inline void lsmblob_init (struct lsmblob *l,u32 secid) +{ +int i; + +for (i =0 ; i <LSMDATA_ENTRIES ; i++) + l->secid[i] = secid;
For all these LSMDATA_ENTRIES, I prefer ARRAY_SIZE(l->secid), but *shrug*
Quoted 85 lines
include/linux/security.h +35
-0+} + +/** +* lsmblob_is_set - report if there is an value in the lsmblob +* @l: Pointer to the exported LSM data +* +* Returns true if there is a secid set, false otherwise +*/ +static inline bool lsmblob_is_set (struct lsmblob *l) +{ +int i; + +for (i =0 ; i <LSMDATA_ENTRIES ; i++) +if (l->secid[i] !=0 ) +return true; +return false; +} + +/** +* lsmblob_equal - report if the two lsmblob's are equal +* @l: Pointer to one LSM data +* @m: Pointer to the other LSM data +* +* Returns true if all entries in the two are equal, false otherwise +*/ +static inline bool lsmblob_equal (struct lsmblob *l,struct lsmblob *m) +{ +int i; + +for (i =0 ; i <LSMDATA_ENTRIES ; i++) +if (l->secid[i] != m->secid[i]) +return false; +return true; +} +/* These functions are in security/commoncap.c */ extern int cap_capable (const struct cred *cred,struct user_namespace *ns,int cap,unsigned int opts);security/security.c +16
-0@@ -317,6 +317,7 @@ static void __init ordered_lsm_init(void)init_debug ("sock blob size = %d\n" , blob_sizes.lbs_sock);init_debug ("superblock blob size = %d\n" , blob_sizes.lbs_superblock);init_debug ("task blob size = %d\n" , blob_sizes.lbs_task); +init_debug ("lsmblob size = %lu\n" ,sizeof (struct lsmblob ));/* * Create any kmem_caches needed for blobs @@ -420,6 +421,11 @@ static int lsm_append(char *new, char **result)return 0 ; } +/* +* Current index to use while initializing the lsmblob secid list. +*/ +static int lsm_slot__initdata ; +/** * security_add_hooks - Add a modules hooks to the hook lists. * @hooks: the hooks to add @@ -427,15 +433,40 @@ static int lsm_append(char *new, char **result)* @lsm: the name of the security module * * Each LSM has to register its hooks with the infrastructure. +* If the LSM is using hooks that export secids allocate a slot +* for it in the lsmblob. */ void __init security_add_hooks (struct security_hook_list *hooks,int count,char *lsm) { +int slot =LSMDATA_INVALID ;int i;for (i =0 ; i < count; i++) { hooks[i].lsm = lsm;hlist_add_tail_rcu (&hooks[i].list, hooks[i].head); +/* +* If this is one of the hooks that uses a secid +* note it so that a slot can in allocated for the +* secid in the lsmblob structure. +*/ + if (hooks[i].head == &security_hook_heads.audit_rule_match || + hooks[i].head == &security_hook_heads.kernel_act_as ||
security/security.c static int lsm_append(char *new, char **result) · line 464
Quoted 10 lines
security/security.c +10
-0+ hooks[i].head == + &security_hook_heads.socket_getpeersec_dgram || + hooks[i].head == &security_hook_heads.secctx_to_secid || + hooks[i].head == &security_hook_heads.secid_to_secctx || + hooks[i].head == &security_hook_heads.ipc_getsecid || + hooks[i].head == &security_hook_heads.task_getsecid || + hooks[i].head == &security_hook_heads.inode_getsecid || + hooks[i].head == &security_hook_heads.cred_getsecid) { + if (slot == LSMDATA_INVALID) { + slot = lsm_slot++;
This needs to sanity check lsm_slot against lsmblob secids array size, just we we catch cases cleanly if an LSM adds a hook but doesn't add itself to the LSMDATA_ENTRIES macro.
Quoted 11 lines
security/security.c +5
-0+init_debug ("%s assigned lsmblob slot %d\n" , + hooks[i].lsm, slot); + } + } + hooks[i].slot = slot; }if (lsm_append (lsm, &lsm_names) <0 )panic ("%s - Cannot get early memory.\n" , __func__);Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Re: [PATCH v2 04/25] LSM: Create and manage the lsmblob data structure.
Quoted 21 lines · Kees Cook
Quoted 20 lines · Casey Schaufler
When more than one security module is exporting data to audit and networking sub-systems a single 32 bit integer is no longer sufficient to represent the data. Add a structure to be used instead.
The lsmblob structure is currently an array of u32 "secids". There is an entry for each of the security modules built into the system that would use secids if active. The system assigns the module a "slot" when it registers hooks. If modules are compiled in but not registered there will be unused slots.
Signed-off-by Casey Schaufler <[email protected]>--- include/linux/lsm_hooks.h | 1 + include/linux/security.h | 62 +++++++++++++++++++++++++++++++++++++++ security/security.c | 31 ++++++++++++++++++++ 3 files changed, 94 insertions(+)
Quoted 14 lines
include/linux/lsm_hooks.h struct security_hook_list { · line 2042
Quoted 10 lines
include/linux/lsm_hooks.h +1
-0@@ -2038,6 +2038,7 @@ struct security_hook_list {struct hlist_head *head;union security_list_options hook;char *lsm; +int slot; } __randomize_layout;Hm, this feels redundant (as does the existing "char *lsm") now that we have
lsm_info. The place for assigned-at-init value isblob_sizes, which hangs off oflsm_info(as does the LSM char *)...
Hm, nevermind. lsm_info is __initdata. I will ponder a way to refactor this in the future. For now, just leave slot in here with char *lsm.
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerRe: [PATCH v2 04/25] LSM: Create and manage the lsmblob data structure.
In reply to Kees CookQuoted 21 lines · Kees Cook
Quoted 20 lines · Casey Schaufler
When more than one security module is exporting data to audit and networking sub-systems a single 32 bit integer is no longer sufficient to represent the data. Add a structure to be used instead.
The lsmblob structure is currently an array of u32 "secids". There is an entry for each of the security modules built into the system that would use secids if active. The system assigns the module a "slot" when it registers hooks. If modules are compiled in but not registered there will be unused slots.
Signed-off-by Casey Schaufler <[email protected]>--- include/linux/lsm_hooks.h | 1 + include/linux/security.h | 62 +++++++++++++++++++++++++++++++++++++++ security/security.c | 31 ++++++++++++++++++++ 3 files changed, 94 insertions(+)
Quoted 13 lines
include/linux/lsm_hooks.h struct security_hook_list { · line 2042
Quoted 10 lines
include/linux/lsm_hooks.h +1
-0@@ -2038,6 +2038,7 @@ struct security_hook_list {struct hlist_head *head;union security_list_options hook;char *lsm; +int slot; } __randomize_layout;Hm, this feels redundant (as does the existing "char *lsm") now that we have
lsm_info. The place for assigned-at-init value isblob_sizes, which hangs off oflsm_info(as does the LSM char *)...
Hm, is right. If the "char *lsm" pointer were replaced with a "struct lsm_info *lsm_info" pointer, and "int slot" added to lsm_info it would be a touch cleaner. A little bit of gimmickry might be required for initialization, but maybe not. It's worth looking into.
Quoted 10 lines
Quoted 10 lines
include/linux/lsm_hooks.h +0
-0/* include/linux/security.h +0
-0@@ -76,6 +76,68 @@ enum lsm_event { LSM_POLICY_CHANGE, };
Quoted 5 lines
include/linux/security.h enum lsm_event { · line 82
Quoted 4 lines
include/linux/security.h +4
-0+/* +* Data exported by the security modules +*/ +#define LSMDATA_ENTRIES ( \
LSMBLOB_ENTRIES?
That would be about 7% better.
Quoted 8 lines
include/linux/security.h enum lsm_event { · line 89
Quoted 7 lines
include/linux/security.h +7
-0+ (IS_ENABLED(CONFIG_SECURITY_SELINUX) ? 1 : 0) + \ + (IS_ENABLED(CONFIG_SECURITY_SMACK) ? 1 : 0) + \ + (IS_ENABLED(CONFIG_SECURITY_APPARMOR) ? 1 : 0) ) + +struct lsmblob { +u32 secid[LSMDATA_ENTRIES ]; +};Cool; I like this auto-sizing.
I figured this was either clever or hideous, but
hadn't fully decided which.
Quoted 10 lines
Quoted 10 lines
include/linux/security.h +10
-0+ +#define LSMDATA_INVALID -1 + +/** +* lsmblob_init - initialize an lsmblob structure. +* @l: Pointer to the data to initialize +* @secid: The initial secid value +* +* Set all secid for all modules to the specified value. +*/
Quoted 8 lines
include/linux/security.h enum lsm_event { · line 105
Quoted 6 lines
include/linux/security.h +6
-0+static inline void lsmblob_init (struct lsmblob *l,u32 secid) +{ +int i; + +for (i =0 ; i <LSMDATA_ENTRIES ; i++) + l->secid[i] = secid;For all these
LSMDATA_ENTRIES, I preferARRAY_SIZE(l->secid), but *shrug*
I suppose, although you're adding compile time, and the definition of LSMDATA_ENTRIES is just above.
Quoted 90 lines
Quoted 90 lines
include/linux/security.h +35
-0+} + +/** +* lsmblob_is_set - report if there is an value in the lsmblob +* @l: Pointer to the exported LSM data +* +* Returns true if there is a secid set, false otherwise +*/ +static inline bool lsmblob_is_set (struct lsmblob *l) +{ +int i; + +for (i =0 ; i <LSMDATA_ENTRIES ; i++) +if (l->secid[i] !=0 ) +return true; +return false; +} + +/** +* lsmblob_equal - report if the two lsmblob's are equal +* @l: Pointer to one LSM data +* @m: Pointer to the other LSM data +* +* Returns true if all entries in the two are equal, false otherwise +*/ +static inline bool lsmblob_equal (struct lsmblob *l,struct lsmblob *m) +{ +int i; + +for (i =0 ; i <LSMDATA_ENTRIES ; i++) +if (l->secid[i] != m->secid[i]) +return false; +return true; +} +/* These functions are in security/commoncap.c */ extern int cap_capable (const struct cred *cred,struct user_namespace *ns,int cap,unsigned int opts);security/security.c +21
-0@@ -317,6 +317,7 @@ static void __init ordered_lsm_init(void)init_debug ("sock blob size = %d\n" , blob_sizes.lbs_sock);init_debug ("superblock blob size = %d\n" , blob_sizes.lbs_superblock);init_debug ("task blob size = %d\n" , blob_sizes.lbs_task); +init_debug ("lsmblob size = %lu\n" ,sizeof (struct lsmblob ));/* * Create any kmem_caches needed for blobs @@ -420,6 +421,11 @@ static int lsm_append(char *new, char **result)return 0 ; } +/* +* Current index to use while initializing the lsmblob secid list. +*/ +static int lsm_slot__initdata ; +/** * security_add_hooks - Add a modules hooks to the hook lists. * @hooks: the hooks to add @@ -427,15 +433,40 @@ static int lsm_append(char *new, char **result)* @lsm: the name of the security module * * Each LSM has to register its hooks with the infrastructure. +* If the LSM is using hooks that export secids allocate a slot +* for it in the lsmblob. */ void __init security_add_hooks (struct security_hook_list *hooks,int count,char *lsm) { +int slot =LSMDATA_INVALID ;int i;for (i =0 ; i < count; i++) { hooks[i].lsm = lsm;hlist_add_tail_rcu (&hooks[i].list, hooks[i].head); +/* +* If this is one of the hooks that uses a secid +* note it so that a slot can in allocated for the +* secid in the lsmblob structure. +*/ + if (hooks[i].head == &security_hook_heads.audit_rule_match || + hooks[i].head == &security_hook_heads.kernel_act_as || + hooks[i].head == + &security_hook_heads.socket_getpeersec_dgram || + hooks[i].head == &security_hook_heads.secctx_to_secid || + hooks[i].head == &security_hook_heads.secid_to_secctx || + hooks[i].head == &security_hook_heads.ipc_getsecid ||
Quoted 8 lines
security/security.c static int lsm_append(char *new, char **result) · line 464
Quoted 5 lines
security/security.c +5
-0+ hooks[i].head == &security_hook_heads.task_getsecid || + hooks[i].head == &security_hook_heads.inode_getsecid || + hooks[i].head == &security_hook_heads.cred_getsecid) { +if (slot ==LSMDATA_INVALID ) { + slot = lsm_slot++;This needs to sanity check
lsm_slotagainst lsmblob secids array size, just we we catch cases cleanly if an LSM adds a hook but doesn't add itself to theLSMDATA_ENTRIESmacro.
Point, and easy enough.
Quoted 11 lines
Quoted 11 lines
security/security.c +5
-0+init_debug ("%s assigned lsmblob slot %d\n" , + hooks[i].lsm, slot); + } + } + hooks[i].slot = slot; }if (lsm_append (lsm, &lsm_names) <0 )panic ("%s - Cannot get early memory.\n" , __func__);Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 5/25 Use lsmblob in security_audit_rule_match
In reply to Casey SchauflerChange the secid parameter of security_audit_rule_match to a lsmblob structure pointer. Pass the entry from the lsmblob structure for the approprite slot to the LSM hook.
Change the users of security_audit_rule_match to use the lsmblob instead of a u32. In some cases this requires a temporary conversion using lsmblob_init() that will go away when other interfaces get converted.
--- include/linux/security.h | 7 ++++--- kernel/auditfilter.c | 4 +++- kernel/auditsc.c | 13 +++++++++---- security/integrity/ima/ima.h | 4 ++-- security/integrity/ima/ima_policy.c | 7 +++++-- security/security.c | 14 ++++++++++++-- 6 files changed, 35 insertions(+), 14 deletions(-)
include/linux/security.h +4 -3
@@ -1757,7 +1757,8 @@ static inline int security_key_getsecurity(struct key *key, char **_buffer)#ifdef CONFIG_SECURITY int security_audit_rule_init (u32 field,u32 op,char *rulestr,void **lsmrule);int security_audit_rule_known (struct audit_krule *krule); -int security_audit_rule_match (u32 secid,u32 field,u32 op,void *lsmrule); +int security_audit_rule_match (struct lsmblob *l,u32 field,u32 op, +void *lsmrule);void security_audit_rule_free (void *lsmrule);#else
@@ -1773,8 +1774,8 @@ static inline int security_audit_rule_known(struct audit_krule *krule)return 0 ; } -static inline int security_audit_rule_match (u32 secid,u32 field,u32 op, -void *lsmrule) +static inline int security_audit_rule_match (struct lsmblob *l,u32 field, +u32 op,void *lsmrule) {return 0 ; }
kernel/auditfilter.c +3 -1
@@ -1324,6 +1324,7 @@ int audit_filter(int msgtype, unsigned int listtype)struct audit_field *f = &e->rule.fields[i];pid_t pid;u32 sid; +struct lsmblob le;switch (f->type) {case AUDIT_PID :
@@ -1354,7 +1355,8 @@ int audit_filter(int msgtype, unsigned int listtype)case AUDIT_SUBJ_CLR :if (f->lsm_rule) {security_task_getsecid (current, &sid); - result =security_audit_rule_match (sid, +lsmblob_init (&le, sid); + result =security_audit_rule_match (&le, f->type, f->op, f->lsm_rule); }break ;
kernel/auditsc.c +9 -4
@@ -445,6 +445,7 @@ static int audit_filter_rules(struct task_struct *tsk,const struct cred *cred;int i, need_sid =1 ;u32 sid; +struct lsmblob le;unsigned int sessionid; cred =rcu_dereference_check (tsk->cred, tsk == current || task_creation);
@@ -630,7 +631,8 @@ static int audit_filter_rules(struct task_struct *tsk,security_task_getsecid (tsk, &sid); need_sid =0 ; } - result =security_audit_rule_match (sid, f->type, +lsmblob_init (&le, sid); + result =security_audit_rule_match (&le, f->type, f->op, f->lsm_rule); }
@@ -645,15 +647,17 @@ static int audit_filter_rules(struct task_struct *tsk,if (f->lsm_rule) {/* Find files that match */ if (name) { +lsmblob_init (&le, name->osid); result =security_audit_rule_match ( - name->osid, + &le, f->type, f->op, f->lsm_rule); }else if (ctx) {list_for_each_entry (n, &ctx->names_list, list) { +lsmblob_init (&le, n->osid);if (security_audit_rule_match ( - n->osid, + &le, f->type, f->op, f->lsm_rule)) {
@@ -665,7 +669,8 @@ static int audit_filter_rules(struct task_struct *tsk,/* Find ipc objects that match */ if (!ctx || ctx->type !=AUDIT_IPC )break ; -if (security_audit_rule_match (ctx->ipc.osid, +lsmblob_init (&le, ctx->ipc.osid); +if (security_audit_rule_match (&le, f->type, f->op, f->lsm_rule)) ++result;
security/integrity/ima/ima.h +2 -2
@@ -307,8 +307,8 @@ static inline int security_filter_rule_init(u32 field, u32 op, char *rulestr,return -EINVAL ; } -static inline int security_filter_rule_match (u32 secid,u32 field,u32 op, -void *lsmrule) +static inline int security_filter_rule_match (struct lsmblob *l,u32 field, +u32 op,void *lsmrule) {return -EINVAL ; }
security/integrity/ima/ima_policy.c +5 -2
@@ -327,6 +327,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode,for (i =0 ; i <MAX_LSM_RULES ; i++) {int rc =0 ;u32 osid; +struct lsmblob le;int retried =0 ;if (!rule->lsm[i].rule)
@@ -337,7 +338,8 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode,case LSM_OBJ_ROLE :case LSM_OBJ_TYPE :security_inode_getsecid (inode, &osid); - rc =security_filter_rule_match (osid, +lsmblob_init (&le, osid); + rc =security_filter_rule_match (&le, rule->lsm[i].type, Audit_equal, rule->lsm[i].rule);
@@ -345,7 +347,8 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode,case LSM_SUBJ_USER :case LSM_SUBJ_ROLE :case LSM_SUBJ_TYPE : - rc =security_filter_rule_match (secid, +lsmblob_init (&le, secid); + rc =security_filter_rule_match (&le, rule->lsm[i].type, Audit_equal, rule->lsm[i].rule);
security/security.c +12 -2
@@ -2447,9 +2447,19 @@ void security_audit_rule_free(void *lsmrule) call_void_hook(audit_rule_free, lsmrule); } -int security_audit_rule_match (u32 secid,u32 field,u32 op,void *lsmrule) +int security_audit_rule_match (struct lsmblob *l,u32 field,u32 op, +void *lsmrule) { -return call_int_hook (audit_rule_match,0 , secid, field, op, lsmrule); +struct security_hook_list *hp; +int rc; + +hlist_for_each_entry (hp, &security_hook_heads.audit_rule_match, list) { + rc = hp->hook.audit_rule_match (l->secid[hp->slot], field, + op, lsmrule); +if (rc !=0 ) +return rc; + } +return 0 ; }#endif /* CONFIG_AUDIT */
Signature · 1 line
2.20.1
Re: [PATCH v2 05/25] Use lsmblob in security_audit_rule_match
Quoted 8 lines · Casey Schaufler
Change the secid parameter of
security_audit_rule_matchto a lsmblob structure pointer. Pass the entry from the lsmblob structure for the approprite slot to the LSM hook.Change the users of
security_audit_rule_matchto use the lsmblob instead of a u32. In some cases this requires a temporary conversion usinglsmblob_init()that will go away when other interfaces get converted.
I like this much better with the LSM-infrastructure "slot" logic.
I do think it's be easier to read if the lsmblob instances were called "blob" instead of "le" and "l"...
-Kees
Quoted 186 lines
Signed-off-by Casey Schaufler <[email protected]>--- include/linux/security.h | 7 ++++--- kernel/auditfilter.c | 4 +++- kernel/auditsc.c | 13 +++++++++---- security/integrity/ima/ima.h | 4 ++-- security/integrity/ima/ima_policy.c | 7 +++++-- security/security.c | 14 ++++++++++++-- 6 files changed, 35 insertions(+), 14 deletions(-)include/linux/security.h +4
-3@@ -1757,7 +1757,8 @@ static inline int security_key_getsecurity(struct key *key, char **_buffer)#ifdef CONFIG_SECURITY int security_audit_rule_init (u32 field,u32 op,char *rulestr,void **lsmrule);int security_audit_rule_known (struct audit_krule *krule); -int security_audit_rule_match (u32 secid,u32 field,u32 op,void *lsmrule); +int security_audit_rule_match (struct lsmblob *l,u32 field,u32 op, +void *lsmrule);void security_audit_rule_free (void *lsmrule);#else @@ -1773,8 +1774,8 @@ static inline int security_audit_rule_known(struct audit_krule *krule)return 0 ; } -static inline int security_audit_rule_match (u32 secid,u32 field,u32 op, -void *lsmrule) +static inline int security_audit_rule_match (struct lsmblob *l,u32 field, +u32 op,void *lsmrule) {return 0 ; }kernel/auditfilter.c +3
-1@@ -1324,6 +1324,7 @@ int audit_filter(int msgtype, unsigned int listtype)struct audit_field *f = &e->rule.fields[i];pid_t pid;u32 sid; +struct lsmblob le;switch (f->type) {case AUDIT_PID :@@ -1354,7 +1355,8 @@ int audit_filter(int msgtype, unsigned int listtype)case AUDIT_SUBJ_CLR :if (f->lsm_rule) {security_task_getsecid (current, &sid); - result =security_audit_rule_match (sid, +lsmblob_init (&le, sid); + result =security_audit_rule_match (&le, f->type, f->op, f->lsm_rule); }break ;kernel/auditsc.c +9
-4@@ -445,6 +445,7 @@ static int audit_filter_rules(struct task_struct *tsk,const struct cred *cred;int i, need_sid =1 ;u32 sid; +struct lsmblob le;unsigned int sessionid; cred =rcu_dereference_check (tsk->cred, tsk == current || task_creation);@@ -630,7 +631,8 @@ static int audit_filter_rules(struct task_struct *tsk,security_task_getsecid (tsk, &sid); need_sid =0 ; } - result =security_audit_rule_match (sid, f->type, +lsmblob_init (&le, sid); + result =security_audit_rule_match (&le, f->type, f->op, f->lsm_rule); }@@ -645,15 +647,17 @@ static int audit_filter_rules(struct task_struct *tsk,if (f->lsm_rule) {/* Find files that match */ if (name) { +lsmblob_init (&le, name->osid); result =security_audit_rule_match ( - name->osid, + &le, f->type, f->op, f->lsm_rule); }else if (ctx) {list_for_each_entry (n, &ctx->names_list, list) { +lsmblob_init (&le, n->osid);if (security_audit_rule_match ( - n->osid, + &le, f->type, f->op, f->lsm_rule)) {@@ -665,7 +669,8 @@ static int audit_filter_rules(struct task_struct *tsk,/* Find ipc objects that match */ if (!ctx || ctx->type !=AUDIT_IPC )break ; -if (security_audit_rule_match (ctx->ipc.osid, +lsmblob_init (&le, ctx->ipc.osid); +if (security_audit_rule_match (&le, f->type, f->op, f->lsm_rule)) ++result;security/integrity/ima/ima.h +2
-2@@ -307,8 +307,8 @@ static inline int security_filter_rule_init(u32 field, u32 op, char *rulestr,return -EINVAL ; } -static inline int security_filter_rule_match (u32 secid,u32 field,u32 op, -void *lsmrule) +static inline int security_filter_rule_match (struct lsmblob *l,u32 field, +u32 op,void *lsmrule) {return -EINVAL ; }security/integrity/ima/ima_policy.c +5
-2@@ -327,6 +327,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode,for (i =0 ; i <MAX_LSM_RULES ; i++) {int rc =0 ;u32 osid; +struct lsmblob le;int retried =0 ;if (!rule->lsm[i].rule)@@ -337,7 +338,8 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode,case LSM_OBJ_ROLE :case LSM_OBJ_TYPE :security_inode_getsecid (inode, &osid); - rc =security_filter_rule_match (osid, +lsmblob_init (&le, osid); + rc =security_filter_rule_match (&le, rule->lsm[i].type, Audit_equal, rule->lsm[i].rule);@@ -345,7 +347,8 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode,case LSM_SUBJ_USER :case LSM_SUBJ_ROLE :case LSM_SUBJ_TYPE : - rc =security_filter_rule_match (secid, +lsmblob_init (&le, secid); + rc =security_filter_rule_match (&le, rule->lsm[i].type, Audit_equal, rule->lsm[i].rule);security/security.c +12
-2@@ -2447,9 +2447,19 @@ void security_audit_rule_free(void *lsmrule) call_void_hook(audit_rule_free, lsmrule); } -int security_audit_rule_match (u32 secid,u32 field,u32 op,void *lsmrule) +int security_audit_rule_match (struct lsmblob *l,u32 field,u32 op, +void *lsmrule) { -return call_int_hook (audit_rule_match,0 , secid, field, op, lsmrule); +struct security_hook_list *hp; +int rc; + +hlist_for_each_entry (hp, &security_hook_heads.audit_rule_match, list) { + rc = hp->hook.audit_rule_match (l->secid[hp->slot], field, + op, lsmrule); +if (rc !=0 ) +return rc; + } +return 0 ; }#endif /* CONFIG_AUDIT */ Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerPATCH v2 6/25 LSM: Use lsmblob in security_kernel_act_as
In reply to Casey SchauflerChange the security_kernel_act_as interface to use a lsmblob structure in place of the single u32 secid in support of module stacking. Change it's only caller, set_security_override, to do the same. Change that one's only caller, set_security_override_from_ctx, to call it with the new parameter type.
--- include/linux/cred.h | 3 ++- include/linux/security.h | 5 +++-- kernel/cred.c | 10 ++++++---- security/security.c | 12 ++++++++++-- 4 files changed, 21 insertions(+), 9 deletions(-)
include/linux/cred.h +2 -1
@@ -22,6 +22,7 @@struct cred ;struct inode ; +struct lsmblob ;/* * COW Supplementary groups list
@@ -165,7 +166,7 @@ extern const struct cred *override_creds(const struct cred *);extern void revert_creds (const struct cred *);extern struct cred *prepare_kernel_cred (struct task_struct *);extern int change_create_files_as (struct cred *,struct inode *); -extern int set_security_override (struct cred *,u32 ); +extern int set_security_override (struct cred *,struct lsmblob *);extern int set_security_override_from_ctx (struct cred *,const char *);extern int set_create_files_as (struct cred *,struct inode *);extern int cred_fscmp (const struct cred *,const struct cred *);
include/linux/security.h +3 -2
@@ -384,7 +384,7 @@ void security_cred_free(struct cred *cred);int security_prepare_creds (struct cred *new,const struct cred *old,gfp_t gfp);void security_transfer_creds (struct cred *new,const struct cred *old);void security_cred_getsecid (const struct cred *c,u32 *secid); -int security_kernel_act_as (struct cred *new,u32 secid); +int security_kernel_act_as (struct cred *new,struct lsmblob *l);int security_kernel_create_files_as (struct cred *new,struct inode *inode);int security_kernel_module_request (char *kmod_name);int security_kernel_load_data (enum kernel_load_data_id id);
@@ -967,7 +967,8 @@ static inline void security_transfer_creds(struct cred *new, { } -static inline int security_kernel_act_as (struct cred *cred,u32 secid) +static inline int security_kernel_act_as (struct cred *cred, +struct lsmblob *l) {return 0 ; }
kernel/cred.c +6 -4
@@ -701,14 +701,14 @@ EXPORT_SYMBOL(prepare_kernel_cred);/** * set_security_override - Set the security ID in a set of credentials * @new: The credentials to alter -* @secid: The LSM security ID to set +* @l: The LSM security information to set * * Set the LSM security ID in a set of credentials so that the subjective * security is overridden when an alternative set of credentials is used. */ -int set_security_override (struct cred *new,u32 secid) +int set_security_override (struct cred *new,struct lsmblob *l) { -return security_kernel_act_as (new, secid); +return security_kernel_act_as (new, l); }EXPORT_SYMBOL (set_security_override);
@@ -724,6 +724,7 @@ EXPORT_SYMBOL(set_security_override);*/ int set_security_override_from_ctx (struct cred *new,const char *secctx) { +struct lsmblob le;u32 secid;int ret;
@@ -731,7 +732,8 @@ int set_security_override_from_ctx(struct cred *new, const char *secctx)if (ret <0 )return ret; -return set_security_override (new, secid); +lsmblob_init (&le, secid); +return set_security_override (new, &le); }EXPORT_SYMBOL (set_security_override_from_ctx);
security/security.c +10 -2
@@ -1641,9 +1641,17 @@ void security_cred_getsecid(const struct cred *c, u32 *secid) }EXPORT_SYMBOL (security_cred_getsecid); -int security_kernel_act_as (struct cred *new,u32 secid) +int security_kernel_act_as (struct cred *new,struct lsmblob *l) { -return call_int_hook (kernel_act_as,0 , new, secid); +struct security_hook_list *hp; +int rc; + +hlist_for_each_entry (hp, &security_hook_heads.kernel_act_as, list) { + rc = hp->hook.kernel_act_as (new, l->secid[hp->slot]); +if (rc !=0 ) +return rc; + } +return 0 ; }int security_kernel_create_files_as (struct cred *new,struct inode *inode)
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 7/25 net: Prepare UDS for secuirty module stacking
In reply to Casey SchauflerChange the data used in UDS SO_PEERSEC processing from a secid to a more general struct lsmblob. Update the security_socket_getpeersec_dgram() interface to use the lsmblob. There is a small amount of scaffolding code that will come out when the security_secid_to_secctx() code is brought in line with the lsmblob.
--- include/linux/security.h | 7 +++++-- include/net/af_unix.h | 2 +- include/net/scm.h | 8 +++++--- net/ipv4/ip_sockglue.c | 8 +++++--- net/unix/af_unix.c | 6 +++--- security/security.c | 16 +++++++++++++--- 6 files changed, 32 insertions(+), 15 deletions(-)
include/linux/security.h +5 -2
@@ -1276,7 +1276,8 @@ int security_socket_shutdown(struct socket *sock, int how);int security_sock_rcv_skb (struct sock *sk,struct sk_buff *skb);int security_socket_getpeersec_stream (struct socket *sock,char __user *optval,int __user *optlen,unsigned len); -int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb,u32 *secid); +int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb, +struct lsmblob *l);int security_sk_alloc (struct sock *sk,int family,gfp_t priority);void security_sk_free (struct sock *sk);void security_sk_clone (const struct sock *sk,struct sock *newsk);
@@ -1414,7 +1415,9 @@ static inline int security_socket_getpeersec_stream(struct socket *sock, char __return -ENOPROTOOPT ; } -static inline int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb,u32 *secid) +static inline int security_socket_getpeersec_dgram (struct socket *sock, +struct sk_buff *skb, +struct lsmblob *l) {return -ENOPROTOOPT ; }
include/net/af_unix.h +1 -1
@@ -36,7 +36,7 @@ struct unix_skb_parms {kgid_t gid;struct scm_fp_list *fp;/* Passed files */ #ifdef CONFIG_SECURITY_NETWORK -u32 secid;/* Security ID */ +struct lsmblob lsmblob;/* Security LSM data */ #endif u32 consumed; } __randomize_layout;
include/net/scm.h +5 -3
@@ -33,7 +33,7 @@ struct scm_cookie {struct scm_fp_list *fp;/* Passed files */ struct scm_creds creds;/* Skb credentials */ #ifdef CONFIG_SECURITY_NETWORK -u32 secid;/* Passed security ID */ +struct lsmblob lsmblob;/* Passed LSM data */ #endif };
@@ -46,7 +46,7 @@ struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl);#ifdef CONFIG_SECURITY_NETWORK static __inline__void unix_get_peersec_dgram (struct socket *sock,struct scm_cookie *scm) { -security_socket_getpeersec_dgram (sock,NULL , &scm->secid); +security_socket_getpeersec_dgram (sock,NULL , &scm->lsmblob); }#else static __inline__void unix_get_peersec_dgram (struct socket *sock,struct scm_cookie *scm)
@@ -97,7 +97,9 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scint err;if (test_bit (SOCK_PASSSEC , &sock->flags)) { - err =security_secid_to_secctx (scm->secid, &secdata, &seclen); +/* Scaffolding - it has to be element 1 for now */ + err =security_secid_to_secctx (scm->lsmblob.secid[1 ], + &secdata, &seclen);if (!err) {put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , seclen, secdata);
net/ipv4/ip_sockglue.c +5 -3
@@ -130,15 +130,17 @@ static void ip_cmsg_recv_checksum(struct msghdr *msg, struct sk_buff *skb,static void ip_cmsg_recv_security (struct msghdr *msg,struct sk_buff *skb) { +struct lsmblob lb;char *secdata; -u32 seclen, secid; +u32 seclen;int err; - err =security_socket_getpeersec_dgram (NULL , skb, &secid); + err =security_socket_getpeersec_dgram (NULL , skb, &lb);if (err)return ; - err =security_secid_to_secctx (secid, &secdata, &seclen); +/* Scaffolding - it has to be element 1 */ + err =security_secid_to_secctx (lb.secid[1 ], &secdata, &seclen);if (err)return ;
net/unix/af_unix.c +3 -3
@@ -143,17 +143,17 @@ static struct hlist_head *unix_sockets_unbound(void *addr)#ifdef CONFIG_SECURITY_NETWORK static void unix_get_secdata (struct scm_cookie *scm,struct sk_buff *skb) { -UNIXCB (skb).secid = scm->secid; +UNIXCB (skb).lsmblob = scm->lsmblob; }static inline void unix_set_secdata (struct scm_cookie *scm,struct sk_buff *skb) { - scm->secid =UNIXCB (skb).secid; + scm->lsmblob =UNIXCB (skb).lsmblob; }static inline bool unix_secdata_eq (struct scm_cookie *scm,struct sk_buff *skb) { -return (scm->secid ==UNIXCB (skb).secid); +return lsmblob_equal (&scm->lsmblob, &(UNIXCB (skb).lsmblob)); }#else static inline void unix_get_secdata (struct scm_cookie *scm,struct sk_buff *skb)
security/security.c +13 -3
@@ -2132,10 +2132,20 @@ int security_socket_getpeersec_stream(struct socket *sock, char __user *optval, optval, optlen, len); } -int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb,u32 *secid) +int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb, +struct lsmblob *l) { -return call_int_hook (socket_getpeersec_dgram, -ENOPROTOOPT , sock, - skb, secid); +struct security_hook_list *hp; +int rc = -ENOPROTOOPT ; + +hlist_for_each_entry (hp, &security_hook_heads.socket_getpeersec_dgram, + list) { + rc = hp->hook.socket_getpeersec_dgram (sock, skb, + &l->secid[hp->slot]); +if (rc !=0 ) +break ; + } +return rc; }EXPORT_SYMBOL (security_socket_getpeersec_dgram);
Signature · 1 line
2.20.1
Re: [PATCH v2 07/25] net: Prepare UDS for secuirty module stacking
typo in Subject -> "secuirty" -> "security"
Quoted 6 lines · Casey Schaufler
Change the data used in UDS
SO_PEERSECprocessing from a secid to a more general struct lsmblob. Update thesecurity_socket_getpeersec_dgram()interface to use the lsmblob. There is a small amount of scaffolding code that will come out when thesecurity_secid_to_secctx()code is brought in line with the lsmblob.
Can you spell this out a little more, "scaffolding code passes slot 1 unconditionally while the following patches will fix this up when they are made aware of lsmblob" etc. (Also, why slot 1 and not slot 0?)
-Kees
Quoted 163 lines
Signed-off-by Casey Schaufler <[email protected]>--- include/linux/security.h | 7 +++++-- include/net/af_unix.h | 2 +- include/net/scm.h | 8 +++++--- net/ipv4/ip_sockglue.c | 8 +++++--- net/unix/af_unix.c | 6 +++--- security/security.c | 16 +++++++++++++--- 6 files changed, 32 insertions(+), 15 deletions(-)include/linux/security.h +5
-2@@ -1276,7 +1276,8 @@ int security_socket_shutdown(struct socket *sock, int how);int security_sock_rcv_skb (struct sock *sk,struct sk_buff *skb);int security_socket_getpeersec_stream (struct socket *sock,char __user *optval,int __user *optlen,unsigned len); -int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb,u32 *secid); +int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb, +struct lsmblob *l);int security_sk_alloc (struct sock *sk,int family,gfp_t priority);void security_sk_free (struct sock *sk);void security_sk_clone (const struct sock *sk,struct sock *newsk);@@ -1414,7 +1415,9 @@ static inline int security_socket_getpeersec_stream(struct socket *sock, char __return -ENOPROTOOPT ; } -static inline int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb,u32 *secid) +static inline int security_socket_getpeersec_dgram (struct socket *sock, +struct sk_buff *skb, +struct lsmblob *l) {return -ENOPROTOOPT ; }include/net/af_unix.h +1
-1@@ -36,7 +36,7 @@ struct unix_skb_parms {kgid_t gid;struct scm_fp_list *fp;/* Passed files */ #ifdef CONFIG_SECURITY_NETWORK -u32 secid;/* Security ID */ +struct lsmblob lsmblob;/* Security LSM data */ #endif u32 consumed; } __randomize_layout;include/net/scm.h +5
-3@@ -33,7 +33,7 @@ struct scm_cookie {struct scm_fp_list *fp;/* Passed files */ struct scm_creds creds;/* Skb credentials */ #ifdef CONFIG_SECURITY_NETWORK -u32 secid;/* Passed security ID */ +struct lsmblob lsmblob;/* Passed LSM data */ #endif };@@ -46,7 +46,7 @@ struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl);#ifdef CONFIG_SECURITY_NETWORK static __inline__void unix_get_peersec_dgram (struct socket *sock,struct scm_cookie *scm) { -security_socket_getpeersec_dgram (sock,NULL , &scm->secid); +security_socket_getpeersec_dgram (sock,NULL , &scm->lsmblob); }#else static __inline__void unix_get_peersec_dgram (struct socket *sock,struct scm_cookie *scm)@@ -97,7 +97,9 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scint err;if (test_bit (SOCK_PASSSEC , &sock->flags)) { - err =security_secid_to_secctx (scm->secid, &secdata, &seclen); +/* Scaffolding - it has to be element 1 for now */ + err =security_secid_to_secctx (scm->lsmblob.secid[1 ], + &secdata, &seclen);if (!err) {put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , seclen, secdata);net/ipv4/ip_sockglue.c +5
-3@@ -130,15 +130,17 @@ static void ip_cmsg_recv_checksum(struct msghdr *msg, struct sk_buff *skb,static void ip_cmsg_recv_security (struct msghdr *msg,struct sk_buff *skb) { +struct lsmblob lb;char *secdata; -u32 seclen, secid; +u32 seclen;int err; - err =security_socket_getpeersec_dgram (NULL , skb, &secid); + err =security_socket_getpeersec_dgram (NULL , skb, &lb);if (err)return ; - err =security_secid_to_secctx (secid, &secdata, &seclen); +/* Scaffolding - it has to be element 1 */ + err =security_secid_to_secctx (lb.secid[1 ], &secdata, &seclen);if (err)return ;net/unix/af_unix.c +3
-3@@ -143,17 +143,17 @@ static struct hlist_head *unix_sockets_unbound(void *addr)#ifdef CONFIG_SECURITY_NETWORK static void unix_get_secdata (struct scm_cookie *scm,struct sk_buff *skb) { -UNIXCB (skb).secid = scm->secid; +UNIXCB (skb).lsmblob = scm->lsmblob; }static inline void unix_set_secdata (struct scm_cookie *scm,struct sk_buff *skb) { - scm->secid =UNIXCB (skb).secid; + scm->lsmblob =UNIXCB (skb).lsmblob; }static inline bool unix_secdata_eq (struct scm_cookie *scm,struct sk_buff *skb) { -return (scm->secid ==UNIXCB (skb).secid); +return lsmblob_equal (&scm->lsmblob, &(UNIXCB (skb).lsmblob)); }#else static inline void unix_get_secdata (struct scm_cookie *scm,struct sk_buff *skb)security/security.c +13
-3@@ -2132,10 +2132,20 @@ int security_socket_getpeersec_stream(struct socket *sock, char __user *optval, optval, optlen, len); } -int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb,u32 *secid) +int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb, +struct lsmblob *l) { -return call_int_hook (socket_getpeersec_dgram, -ENOPROTOOPT , sock, - skb, secid); +struct security_hook_list *hp; +int rc = -ENOPROTOOPT ; + +hlist_for_each_entry (hp, &security_hook_heads.socket_getpeersec_dgram, + list) { + rc = hp->hook.socket_getpeersec_dgram (sock, skb, + &l->secid[hp->slot]); +if (rc !=0 ) +break ; + } +return rc; }EXPORT_SYMBOL (security_socket_getpeersec_dgram);Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerRe: [PATCH v2 07/25] net: Prepare UDS for secuirty module stacking
Quoted 9 lines · Kees Cook
typo in Subject -> "secuirty" -> "security"
Quoted 6 lines · Casey Schaufler
Change the data used in UDS
SO_PEERSECprocessing from a secid to a more general struct lsmblob. Update thesecurity_socket_getpeersec_dgram()interface to use the lsmblob. There is a small amount of scaffolding code that will come out when thesecurity_secid_to_secctx()code is brought in line with the lsmblob.
Quoted 3 lines
Can you spell this out a little more, "scaffolding code passes slot 1 unconditionally while the following patches will fix this up when they are made aware of lsmblob" etc. (Also, why slot 1 and not slot 0?)
It should be slot 0. An earlier version had special meaning for slot 0, but that proved unnecessary. This is a bug, as it will break if you have exactly one of the major LSMs built in.
Quoted 164 lines
-Kees
Quoted 162 lines
Signed-off-by Casey Schaufler <[email protected]>--- include/linux/security.h | 7 +++++-- include/net/af_unix.h | 2 +- include/net/scm.h | 8 +++++--- net/ipv4/ip_sockglue.c | 8 +++++--- net/unix/af_unix.c | 6 +++--- security/security.c | 16 +++++++++++++--- 6 files changed, 32 insertions(+), 15 deletions(-)include/linux/security.h +5
-2@@ -1276,7 +1276,8 @@ int security_socket_shutdown(struct socket *sock, int how);int security_sock_rcv_skb (struct sock *sk,struct sk_buff *skb);int security_socket_getpeersec_stream (struct socket *sock,char __user *optval,int __user *optlen,unsigned len); -int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb,u32 *secid); +int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb, +struct lsmblob *l);int security_sk_alloc (struct sock *sk,int family,gfp_t priority);void security_sk_free (struct sock *sk);void security_sk_clone (const struct sock *sk,struct sock *newsk);@@ -1414,7 +1415,9 @@ static inline int security_socket_getpeersec_stream(struct socket *sock, char __return -ENOPROTOOPT ; } -static inline int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb,u32 *secid) +static inline int security_socket_getpeersec_dgram (struct socket *sock, +struct sk_buff *skb, +struct lsmblob *l) {return -ENOPROTOOPT ; }include/net/af_unix.h +1
-1@@ -36,7 +36,7 @@ struct unix_skb_parms {kgid_t gid;struct scm_fp_list *fp;/* Passed files */ #ifdef CONFIG_SECURITY_NETWORK -u32 secid;/* Security ID */ +struct lsmblob lsmblob;/* Security LSM data */ #endif u32 consumed; } __randomize_layout;include/net/scm.h +5
-3@@ -33,7 +33,7 @@ struct scm_cookie {struct scm_fp_list *fp;/* Passed files */ struct scm_creds creds;/* Skb credentials */ #ifdef CONFIG_SECURITY_NETWORK -u32 secid;/* Passed security ID */ +struct lsmblob lsmblob;/* Passed LSM data */ #endif };@@ -46,7 +46,7 @@ struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl);#ifdef CONFIG_SECURITY_NETWORK static __inline__void unix_get_peersec_dgram (struct socket *sock,struct scm_cookie *scm) { -security_socket_getpeersec_dgram (sock,NULL , &scm->secid); +security_socket_getpeersec_dgram (sock,NULL , &scm->lsmblob); }#else static __inline__void unix_get_peersec_dgram (struct socket *sock,struct scm_cookie *scm)@@ -97,7 +97,9 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scint err;if (test_bit (SOCK_PASSSEC , &sock->flags)) { - err =security_secid_to_secctx (scm->secid, &secdata, &seclen); +/* Scaffolding - it has to be element 1 for now */ + err =security_secid_to_secctx (scm->lsmblob.secid[1 ], + &secdata, &seclen);if (!err) {put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , seclen, secdata);net/ipv4/ip_sockglue.c +5
-3@@ -130,15 +130,17 @@ static void ip_cmsg_recv_checksum(struct msghdr *msg, struct sk_buff *skb,static void ip_cmsg_recv_security (struct msghdr *msg,struct sk_buff *skb) { +struct lsmblob lb;char *secdata; -u32 seclen, secid; +u32 seclen;int err; - err =security_socket_getpeersec_dgram (NULL , skb, &secid); + err =security_socket_getpeersec_dgram (NULL , skb, &lb);if (err)return ; - err =security_secid_to_secctx (secid, &secdata, &seclen); +/* Scaffolding - it has to be element 1 */ + err =security_secid_to_secctx (lb.secid[1 ], &secdata, &seclen);if (err)return ;net/unix/af_unix.c +3
-3@@ -143,17 +143,17 @@ static struct hlist_head *unix_sockets_unbound(void *addr)#ifdef CONFIG_SECURITY_NETWORK static void unix_get_secdata (struct scm_cookie *scm,struct sk_buff *skb) { -UNIXCB (skb).secid = scm->secid; +UNIXCB (skb).lsmblob = scm->lsmblob; }static inline void unix_set_secdata (struct scm_cookie *scm,struct sk_buff *skb) { - scm->secid =UNIXCB (skb).secid; + scm->lsmblob =UNIXCB (skb).lsmblob; }static inline bool unix_secdata_eq (struct scm_cookie *scm,struct sk_buff *skb) { -return (scm->secid ==UNIXCB (skb).secid); +return lsmblob_equal (&scm->lsmblob, &(UNIXCB (skb).lsmblob)); }#else static inline void unix_get_secdata (struct scm_cookie *scm,struct sk_buff *skb)security/security.c +13
-3@@ -2132,10 +2132,20 @@ int security_socket_getpeersec_stream(struct socket *sock, char __user *optval, optval, optlen, len); } -int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb,u32 *secid) +int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb, +struct lsmblob *l) { -return call_int_hook (socket_getpeersec_dgram, -ENOPROTOOPT , sock, - skb, secid); +struct security_hook_list *hp; +int rc = -ENOPROTOOPT ; + +hlist_for_each_entry (hp, &security_hook_heads.socket_getpeersec_dgram, + list) { + rc = hp->hook.socket_getpeersec_dgram (sock, skb, + &l->secid[hp->slot]); +if (rc !=0 ) +break ; + } +return rc; }EXPORT_SYMBOL (security_socket_getpeersec_dgram);Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 8/25 LSM: Use lsmblob in security_secctx_to_secid
In reply to Casey SchauflerChange security_secctx_to_secid() to fill in a lsmblob instead of a u32 secid. Multiple LSMs may be able to interpret the string, and this allows for setting whichever secid is appropriate. In some cases there is scaffolding where other interfaces have yet to be converted.
--- include/linux/security.h | 5 +++-- kernel/cred.c | 4 +--- net/netfilter/nft_meta.c | 13 ++++++------- net/netfilter/xt_SECMARK.c | 6 ++++-- net/netlabel/netlabel_unlabeled.c | 14 ++++++++------ security/security.c | 15 ++++++++++++--- 6 files changed, 34 insertions(+), 23 deletions(-)
include/linux/security.h +3 -2
@@ -443,7 +443,8 @@ int security_setprocattr(const char *lsm, const char *name, void *value,int security_netlink_send (struct sock *sk,struct sk_buff *skb);int security_ismaclabel (const char *name);int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen); -int security_secctx_to_secid (const char *secdata,u32 seclen,u32 *secid); +int security_secctx_to_secid (const char *secdata,u32 seclen, +struct lsmblob *l);void security_release_secctx (char *secdata,u32 seclen);void security_inode_invalidate_secctx (struct inode *inode);
@@ -1226,7 +1227,7 @@ static inline int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclestatic inline int security_secctx_to_secid (const char *secdata,u32 seclen, -u32 *secid) +struct lsmblob *l) {return -EOPNOTSUPP ; }
kernel/cred.c +1 -3
@@ -725,14 +725,12 @@ EXPORT_SYMBOL(set_security_override);int set_security_override_from_ctx (struct cred *new,const char *secctx) {struct lsmblob le; -u32 secid;int ret; - ret =security_secctx_to_secid (secctx,strlen (secctx), &secid); + ret =security_secctx_to_secid (secctx,strlen (secctx), &le);if (ret <0 )return ret; -lsmblob_init (&le, secid);return set_security_override (new, &le); }EXPORT_SYMBOL (set_security_override_from_ctx);
net/netfilter/nft_meta.c +6 -7
@@ -576,21 +576,20 @@ static const struct nla_policy nft_secmark_policy[NFTA_SECMARK_MAX + 1] = {static int nft_secmark_compute_secid (struct nft_secmark *priv) { -u32 tmp_secid =0 ; +struct lsmblob le;int err; - err =security_secctx_to_secid (priv->ctx,strlen (priv->ctx), &tmp_secid); + err =security_secctx_to_secid (priv->ctx,strlen (priv->ctx), &le);if (err)return err; -if (!tmp_secid) -return -ENOENT ; - - err =security_secmark_relabel_packet (tmp_secid); +/* Using le[1] is scaffolding */ + err =security_secmark_relabel_packet (le.secid[1 ]);if (err)return err; - priv->secid = tmp_secid; +/* Using le[1] is scaffolding */ + priv->secid = le.secid[1 ];return 0 ; }
net/netfilter/xt_SECMARK.c +4 -2
@@ -49,13 +49,13 @@ secmark_tg(struct sk_buff *skb, const struct xt_action_param *par)static int checkentry_lsm (struct xt_secmark_target_info *info) { +struct lsmblob le;int err; info->secctx[SECMARK_SECCTX_MAX -1 ] ='\0' ; info->secid =0 ; - err =security_secctx_to_secid (info->secctx,strlen (info->secctx), - &info->secid); + err =security_secctx_to_secid (info->secctx,strlen (info->secctx), &le);if (err) {if (err == -EINVAL ) pr_info_ratelimited("invalid security context \'%s\'\n",
@@ -63,6 +63,8 @@ static int checkentry_lsm(struct xt_secmark_target_info *info)return err; } +/* scaffolding during the transition */ + info->secid = le.secid[1 ];if (!info->secid) {pr_info_ratelimited ("unable to map security context \'%s\'\n" , info->secctx);
net/netlabel/netlabel_unlabeled.c +8 -6
@@ -895,7 +895,7 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb,void *addr;void *mask;u32 addr_len; -u32 secid; +struct lsmblob le;struct netlbl_audit audit_info;/* Don't allow users to add both IPv4 and IPv6 addresses for a
@@ -919,12 +919,13 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb, ret_val =security_secctx_to_secid (nla_data (info->attrs[NLBL_UNLABEL_A_SECCTX ]),nla_len (info->attrs[NLBL_UNLABEL_A_SECCTX ]), - &secid); + &le);if (ret_val !=0 )return ret_val; +/* scaffolding with the [1] */ return netlbl_unlhsh_add (&init_net, - dev_name, addr, mask, addr_len, secid, + dev_name, addr, mask, addr_len, le.secid[1 ], &audit_info); }
@@ -946,7 +947,7 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb,void *addr;void *mask;u32 addr_len; -u32 secid; +struct lsmblob le;struct netlbl_audit audit_info;/* Don't allow users to add both IPv4 and IPv6 addresses for a
@@ -968,12 +969,13 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb, ret_val =security_secctx_to_secid (nla_data (info->attrs[NLBL_UNLABEL_A_SECCTX ]),nla_len (info->attrs[NLBL_UNLABEL_A_SECCTX ]), - &secid); + &le);if (ret_val !=0 )return ret_val; +/* scaffolding with the [1] */ return netlbl_unlhsh_add (&init_net, -NULL , addr, mask, addr_len, secid, +NULL , addr, mask, addr_len, le.secid[1 ], &audit_info); }
security/security.c +12 -3
@@ -1994,10 +1994,19 @@ int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen) }EXPORT_SYMBOL (security_secid_to_secctx); -int security_secctx_to_secid (const char *secdata,u32 seclen,u32 *secid) +int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *l) { - *secid =0 ; -return call_int_hook (secctx_to_secid,0 , secdata, seclen, secid); +struct security_hook_list *hp; +int rc; + +lsmblob_init (l,0 ); +hlist_for_each_entry (hp, &security_hook_heads.secctx_to_secid, list) { + rc = hp->hook.secctx_to_secid (secdata, seclen, + &l->secid[hp->slot]); +if (rc !=0 ) +return rc; + } +return 0 ; }EXPORT_SYMBOL (security_secctx_to_secid);
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 9/25 LSM: Use lsmblob in security_secid_to_secctx
In reply to Casey SchauflerChange security_secid_to_secctx() to take a lsmblob as input instead of a u32 secid. It will then call the LSM hooks using the lsmblob element allocated for that module. The callers have been updated as well. This allows for the possibility that more than one module may called upon to translate a secid to a string, as can occur in the audit code.
--- drivers/android/binder.c | 4 +++- include/linux/security.h | 5 +++-- include/net/scm.h | 4 +--- kernel/audit.c | 9 +++++++-- kernel/auditsc.c | 13 +++++++++---- net/ipv4/ip_sockglue.c | 3 +-- net/netfilter/nf_conntrack_netlink.c | 8 ++++++-- net/netfilter/nf_conntrack_standalone.c | 4 +++- net/netfilter/nfnetlink_queue.c | 8 ++++++-- net/netlabel/netlabel_unlabeled.c | 18 ++++++++++++++---- net/netlabel/netlabel_user.c | 6 +++--- security/security.c | 14 +++++++++++--- 12 files changed, 67 insertions(+), 29 deletions(-)
drivers/android/binder.c +3 -1
@@ -3120,9 +3120,11 @@ static void binder_transaction(struct binder_proc *proc,if (target_node && target_node->txn_security_ctx) {u32 secid; +struct lsmblob le;security_task_getsecid (proc->tsk, &secid); - ret =security_secid_to_secctx (secid, &secctx, &secctx_sz); +lsmblob_init (&le, secid); + ret =security_secid_to_secctx (&le, &secctx, &secctx_sz);if (ret) { return_error =BR_FAILED_REPLY ; return_error_param = ret;
include/linux/security.h +3 -2
@@ -442,7 +442,7 @@ int security_setprocattr(const char *lsm, const char *name, void *value, size_t size);int security_netlink_send (struct sock *sk,struct sk_buff *skb);int security_ismaclabel (const char *name); -int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen); +int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *l);void security_release_secctx (char *secdata,u32 seclen);
@@ -1220,7 +1220,8 @@ static inline int security_ismaclabel(const char *name)return 0 ; } -static inline int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen) +static inline int security_secid_to_secctx (struct lsmblob *l, +char **secdata,u32 *seclen) {return -EOPNOTSUPP ; }
include/net/scm.h +1 -3
@@ -97,9 +97,7 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scint err;if (test_bit (SOCK_PASSSEC , &sock->flags)) { -/* Scaffolding - it has to be element 1 for now */ - err =security_secid_to_secctx (scm->lsmblob.secid[1 ], - &secdata, &seclen); + err =security_secid_to_secctx (&scm->lsmblob, &secdata, &seclen);if (!err) {put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , seclen, secdata);
kernel/audit.c +7 -2
@@ -1430,7 +1430,10 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)case AUDIT_SIGNAL_INFO : len =0 ;if (audit_sig_sid) { - err =security_secid_to_secctx (audit_sig_sid, &ctx, &len); +struct lsmblob le; + +lsmblob_init (&le, audit_sig_sid); + err =security_secid_to_secctx (&le, &ctx, &len);if (err)return err; }
@@ -2073,12 +2076,14 @@ int audit_log_task_context(struct audit_buffer *ab)unsigned len;int error;u32 sid; +struct lsmblob le;security_task_getsecid (current, &sid);if (!sid)return 0 ; - error =security_secid_to_secctx (sid, &ctx, &len); +lsmblob_init (&le, sid); + error =security_secid_to_secctx (&le, &ctx, &len);if (error) {if (error != -EINVAL ) goto error_path;
kernel/auditsc.c +9 -4
@@ -946,6 +946,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,char *ctx =NULL ;u32 len;int rc =0 ; +struct lsmblob le; ab =audit_log_start (context,GFP_KERNEL ,AUDIT_OBJ_PID );if (!ab)
@@ -955,7 +956,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,from_kuid (&init_user_ns, auid), from_kuid(&init_user_ns, uid), sessionid);if (sid) { -if (security_secid_to_secctx (sid, &ctx, &len)) { +lsmblob_init (&le, sid); +if (security_secid_to_secctx (&le, &ctx, &len)) {audit_log_format (ab," obj=(none)" ); rc =1 ; }else {
@@ -1197,7 +1199,9 @@ static void show_special(struct audit_context *context, int *call_panic)if (osid) {char *ctx =NULL ;u32 len; -if (security_secid_to_secctx (osid, &ctx, &len)) { +struct lsmblob le; +lsmblob_init (&le, osid); +if (security_secid_to_secctx (&le, &ctx, &len)) {audit_log_format (ab," osid=%u" , osid); *call_panic =1 ; }else {
@@ -1348,9 +1352,10 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,if (n->osid !=0 ) {char *ctx =NULL ;u32 len; +struct lsmblob le; -if (security_secid_to_secctx ( - n->osid, &ctx, &len)) { +lsmblob_init (&le, n->osid); +if (security_secid_to_secctx (&le, &ctx, &len)) {audit_log_format (ab," osid=%u" , n->osid);if (call_panic) *call_panic =2 ;
net/ipv4/ip_sockglue.c +1 -2
@@ -139,8 +139,7 @@ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb)if (err)return ; -/* Scaffolding - it has to be element 1 */ - err =security_secid_to_secctx (lb.secid[1 ], &secdata, &seclen); + err =security_secid_to_secctx (&lb, &secdata, &seclen);if (err)return ;
net/netfilter/nf_conntrack_netlink.c +6 -2
@@ -330,8 +330,10 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)struct nlattr *nest_secctx;int len, ret;char *secctx; +struct lsmblob le; - ret =security_secid_to_secctx (ct->secmark, &secctx, &len); +lsmblob_init (&le, ct->secmark); + ret =security_secid_to_secctx (&le, &secctx, &len);if (ret)return 0 ;
@@ -615,8 +617,10 @@ static inline int ctnetlink_secctx_size(const struct nf_conn *ct) {#ifdef CONFIG_NF_CONNTRACK_SECMARK int len, ret; +struct lsmblob le; - ret =security_secid_to_secctx (ct->secmark,NULL , &len); +lsmblob_init (&le, ct->secmark); + ret =security_secid_to_secctx (&le,NULL , &len);if (ret)return 0 ;
net/netfilter/nf_conntrack_standalone.c +3 -1
@@ -175,8 +175,10 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)int ret;u32 len;char *secctx; +struct lsmblob le; - ret =security_secid_to_secctx (ct->secmark, &secctx, &len); +lsmblob_init (&le, ct->secmark); + ret =security_secid_to_secctx (&le, &secctx, &len);if (ret)return ;
net/netfilter/nfnetlink_queue.c +6 -2
@@ -309,13 +309,17 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata) {u32 seclen =0 ;#if IS_ENABLED (CONFIG_NETWORK_SECMARK ) +struct lsmblob le; +if (!skb || !sk_fullsock (skb->sk))return 0 ;read_lock_bh (&skb->sk->sk_callback_lock); -if (skb->secmark) -security_secid_to_secctx (skb->secmark, secdata, &seclen); +if (skb->secmark) { +lsmblob_init (&le, skb->secmark); +security_secid_to_secctx (&le, secdata, &seclen); + }read_unlock_bh (&skb->sk->sk_callback_lock);#endif
net/netlabel/netlabel_unlabeled.c +14 -4
@@ -389,6 +389,7 @@ int netlbl_unlhsh_add(struct net *net,struct audit_buffer *audit_buf =NULL ;char *secctx =NULL ;u32 secctx_len; +struct lsmblob le;if (addr_len !=sizeof (struct in_addr ) && addr_len !=sizeof (struct in6_addr ))
@@ -451,7 +452,8 @@ int netlbl_unlhsh_add(struct net *net, unlhsh_add_return:rcu_read_unlock ();if (audit_buf !=NULL ) { -if (security_secid_to_secctx (secid, +lsmblob_init (&le, secid); +if (security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , secctx);
@@ -488,6 +490,7 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,struct net_device *dev;char *secctx;u32 secctx_len; +struct lsmblob le;spin_lock (&netlbl_unlhsh_lock); list_entry = netlbl_af4list_remove(addr->s_addr, mask->s_addr,
@@ -507,8 +510,10 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, addr->s_addr, mask->s_addr);if (dev !=NULL )dev_put (dev); +if (entry !=NULL ) +lsmblob_init (&le, entry->secid);if (entry !=NULL && -security_secid_to_secctx (entry->secid, +security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , secctx);security_release_secctx (secctx, secctx_len);
@@ -550,6 +555,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,struct net_device *dev;char *secctx;u32 secctx_len; +struct lsmblob le;spin_lock (&netlbl_unlhsh_lock); list_entry =netlbl_af6list_remove (addr, mask, &iface->addr6_list);
@@ -568,8 +574,10 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, addr, mask);if (dev !=NULL )dev_put (dev); +if (entry !=NULL ) +lsmblob_init (&le, entry->secid);if (entry !=NULL && -security_secid_to_secctx (entry->secid, +security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , secctx);security_release_secctx (secctx, secctx_len);
@@ -1090,6 +1098,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,u32 secid;char *secctx;u32 secctx_len; +struct lsmblob le; data = genlmsg_put(cb_arg->skb, NETLINK_CB(cb_arg->nl_cb->skb).portid, cb_arg->seq, &netlbl_unlabel_gnl_family,
@@ -1144,7 +1153,8 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, secid = addr6->secid; } - ret_val =security_secid_to_secctx (secid, &secctx, &secctx_len); +lsmblob_init (&le, secid); + ret_val =security_secid_to_secctx (&le, &secctx, &secctx_len);if (ret_val !=0 ) goto list_cb_failure; ret_val = nla_put(cb_arg->skb,
net/netlabel/netlabel_user.c +3 -3
@@ -100,6 +100,7 @@ struct audit_buffer *netlbl_audit_start_common(int type,struct audit_buffer *audit_buf;char *secctx;u32 secctx_len; +struct lsmblob le;if (audit_enabled ==AUDIT_OFF )return NULL ;
@@ -112,10 +113,9 @@ struct audit_buffer *netlbl_audit_start_common(int type,from_kuid (&init_user_ns, audit_info->loginuid), audit_info->sessionid); +lsmblob_init (&le, audit_info->secid);if (audit_info->secid !=0 && -security_secid_to_secctx (audit_info->secid, - &secctx, - &secctx_len) ==0 ) { +security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," subj=%s" , secctx);security_release_secctx (secctx, secctx_len); }
security/security.c +11 -3
@@ -1987,10 +1987,18 @@ int security_ismaclabel(const char *name) }EXPORT_SYMBOL (security_ismaclabel); -int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen) +int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen) { -return call_int_hook (secid_to_secctx, -EOPNOTSUPP , secid, secdata, - seclen); +struct security_hook_list *hp; +int rc; + +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) { + rc = hp->hook.secid_to_secctx (l->secid[hp->slot], + secdata, seclen); +if (rc !=0 ) +return rc; + } +return 0 ; }EXPORT_SYMBOL (security_secid_to_secctx);
Signature · 1 line
2.20.1
Re: [PATCH v2 09/25] LSM: Use lsmblob in security_secid_to_secctx
Quoted 7 lines · Casey Schaufler
Change
security_secid_to_secctx()to take a lsmblob as input instead of a u32 secid. It will then call the LSM hooks using the lsmblob element allocated for that module. The callers have been updated as well. This allows for the possibility that more than one module may called upon to translate a secid to a string, as can occur in the audit code.
Cool. The progression of scaffolding here is pretty clear to me.
-Kees
Quoted 366 lines
Signed-off-by Casey Schaufler <[email protected]>--- drivers/android/binder.c | 4 +++- include/linux/security.h | 5 +++-- include/net/scm.h | 4 +--- kernel/audit.c | 9 +++++++-- kernel/auditsc.c | 13 +++++++++---- net/ipv4/ip_sockglue.c | 3 +-- net/netfilter/nf_conntrack_netlink.c | 8 ++++++-- net/netfilter/nf_conntrack_standalone.c | 4 +++- net/netfilter/nfnetlink_queue.c | 8 ++++++-- net/netlabel/netlabel_unlabeled.c | 18 ++++++++++++++---- net/netlabel/netlabel_user.c | 6 +++--- security/security.c | 14 +++++++++++--- 12 files changed, 67 insertions(+), 29 deletions(-)drivers/android/binder.c +3
-1@@ -3120,9 +3120,11 @@ static void binder_transaction(struct binder_proc *proc,if (target_node && target_node->txn_security_ctx) {u32 secid; +struct lsmblob le;security_task_getsecid (proc->tsk, &secid); - ret =security_secid_to_secctx (secid, &secctx, &secctx_sz); +lsmblob_init (&le, secid); + ret =security_secid_to_secctx (&le, &secctx, &secctx_sz);if (ret) { return_error =BR_FAILED_REPLY ; return_error_param = ret;include/linux/security.h +3
-2@@ -442,7 +442,7 @@ int security_setprocattr(const char *lsm, const char *name, void *value, size_t size);int security_netlink_send (struct sock *sk,struct sk_buff *skb);int security_ismaclabel (const char *name); -int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen); +int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *l);void security_release_secctx (char *secdata,u32 seclen);@@ -1220,7 +1220,8 @@ static inline int security_ismaclabel(const char *name)return 0 ; } -static inline int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen) +static inline int security_secid_to_secctx (struct lsmblob *l, +char **secdata,u32 *seclen) {return -EOPNOTSUPP ; }include/net/scm.h +1
-3@@ -97,9 +97,7 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scint err;if (test_bit (SOCK_PASSSEC , &sock->flags)) { -/* Scaffolding - it has to be element 1 for now */ - err =security_secid_to_secctx (scm->lsmblob.secid[1 ], - &secdata, &seclen); + err =security_secid_to_secctx (&scm->lsmblob, &secdata, &seclen);if (!err) {put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , seclen, secdata);kernel/audit.c +7
-2@@ -1430,7 +1430,10 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)case AUDIT_SIGNAL_INFO : len =0 ;if (audit_sig_sid) { - err =security_secid_to_secctx (audit_sig_sid, &ctx, &len); +struct lsmblob le; + +lsmblob_init (&le, audit_sig_sid); + err =security_secid_to_secctx (&le, &ctx, &len);if (err)return err; }@@ -2073,12 +2076,14 @@ int audit_log_task_context(struct audit_buffer *ab)unsigned len;int error;u32 sid; +struct lsmblob le;security_task_getsecid (current, &sid);if (!sid)return 0 ; - error =security_secid_to_secctx (sid, &ctx, &len); +lsmblob_init (&le, sid); + error =security_secid_to_secctx (&le, &ctx, &len);if (error) {if (error != -EINVAL ) goto error_path;kernel/auditsc.c +9
-4@@ -946,6 +946,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,char *ctx =NULL ;u32 len;int rc =0 ; +struct lsmblob le; ab =audit_log_start (context,GFP_KERNEL ,AUDIT_OBJ_PID );if (!ab)@@ -955,7 +956,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,from_kuid (&init_user_ns, auid), from_kuid(&init_user_ns, uid), sessionid);if (sid) { -if (security_secid_to_secctx (sid, &ctx, &len)) { +lsmblob_init (&le, sid); +if (security_secid_to_secctx (&le, &ctx, &len)) {audit_log_format (ab," obj=(none)" ); rc =1 ; }else {@@ -1197,7 +1199,9 @@ static void show_special(struct audit_context *context, int *call_panic)if (osid) {char *ctx =NULL ;u32 len; -if (security_secid_to_secctx (osid, &ctx, &len)) { +struct lsmblob le; +lsmblob_init (&le, osid); +if (security_secid_to_secctx (&le, &ctx, &len)) {audit_log_format (ab," osid=%u" , osid); *call_panic =1 ; }else {@@ -1348,9 +1352,10 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,if (n->osid !=0 ) {char *ctx =NULL ;u32 len; +struct lsmblob le; -if (security_secid_to_secctx ( - n->osid, &ctx, &len)) { +lsmblob_init (&le, n->osid); +if (security_secid_to_secctx (&le, &ctx, &len)) {audit_log_format (ab," osid=%u" , n->osid);if (call_panic) *call_panic =2 ;net/ipv4/ip_sockglue.c +1
-2@@ -139,8 +139,7 @@ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb)if (err)return ; -/* Scaffolding - it has to be element 1 */ - err =security_secid_to_secctx (lb.secid[1 ], &secdata, &seclen); + err =security_secid_to_secctx (&lb, &secdata, &seclen);if (err)return ;net/netfilter/nf_conntrack_netlink.c +6
-2@@ -330,8 +330,10 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)struct nlattr *nest_secctx;int len, ret;char *secctx; +struct lsmblob le; - ret =security_secid_to_secctx (ct->secmark, &secctx, &len); +lsmblob_init (&le, ct->secmark); + ret =security_secid_to_secctx (&le, &secctx, &len);if (ret)return 0 ;@@ -615,8 +617,10 @@ static inline int ctnetlink_secctx_size(const struct nf_conn *ct) {#ifdef CONFIG_NF_CONNTRACK_SECMARK int len, ret; +struct lsmblob le; - ret =security_secid_to_secctx (ct->secmark,NULL , &len); +lsmblob_init (&le, ct->secmark); + ret =security_secid_to_secctx (&le,NULL , &len);if (ret)return 0 ;net/netfilter/nf_conntrack_standalone.c +3
-1@@ -175,8 +175,10 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)int ret;u32 len;char *secctx; +struct lsmblob le; - ret =security_secid_to_secctx (ct->secmark, &secctx, &len); +lsmblob_init (&le, ct->secmark); + ret =security_secid_to_secctx (&le, &secctx, &len);if (ret)return ;net/netfilter/nfnetlink_queue.c +6
-2@@ -309,13 +309,17 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata) {u32 seclen =0 ;#if IS_ENABLED (CONFIG_NETWORK_SECMARK ) +struct lsmblob le; +if (!skb || !sk_fullsock (skb->sk))return 0 ;read_lock_bh (&skb->sk->sk_callback_lock); -if (skb->secmark) -security_secid_to_secctx (skb->secmark, secdata, &seclen); +if (skb->secmark) { +lsmblob_init (&le, skb->secmark); +security_secid_to_secctx (&le, secdata, &seclen); + }read_unlock_bh (&skb->sk->sk_callback_lock);#endif net/netlabel/netlabel_unlabeled.c +14
-4@@ -389,6 +389,7 @@ int netlbl_unlhsh_add(struct net *net,struct audit_buffer *audit_buf =NULL ;char *secctx =NULL ;u32 secctx_len; +struct lsmblob le;if (addr_len !=sizeof (struct in_addr ) && addr_len !=sizeof (struct in6_addr ))@@ -451,7 +452,8 @@ int netlbl_unlhsh_add(struct net *net, unlhsh_add_return:rcu_read_unlock ();if (audit_buf !=NULL ) { -if (security_secid_to_secctx (secid, +lsmblob_init (&le, secid); +if (security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , secctx);@@ -488,6 +490,7 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,struct net_device *dev;char *secctx;u32 secctx_len; +struct lsmblob le;spin_lock (&netlbl_unlhsh_lock); list_entry = netlbl_af4list_remove(addr->s_addr, mask->s_addr,@@ -507,8 +510,10 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, addr->s_addr, mask->s_addr);if (dev !=NULL )dev_put (dev); +if (entry !=NULL ) +lsmblob_init (&le, entry->secid);if (entry !=NULL && -security_secid_to_secctx (entry->secid, +security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , secctx);security_release_secctx (secctx, secctx_len);@@ -550,6 +555,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,struct net_device *dev;char *secctx;u32 secctx_len; +struct lsmblob le;spin_lock (&netlbl_unlhsh_lock); list_entry =netlbl_af6list_remove (addr, mask, &iface->addr6_list);@@ -568,8 +574,10 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, addr, mask);if (dev !=NULL )dev_put (dev); +if (entry !=NULL ) +lsmblob_init (&le, entry->secid);if (entry !=NULL && -security_secid_to_secctx (entry->secid, +security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , secctx);security_release_secctx (secctx, secctx_len);@@ -1090,6 +1098,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,u32 secid;char *secctx;u32 secctx_len; +struct lsmblob le; data = genlmsg_put(cb_arg->skb, NETLINK_CB(cb_arg->nl_cb->skb).portid, cb_arg->seq, &netlbl_unlabel_gnl_family,@@ -1144,7 +1153,8 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, secid = addr6->secid; } - ret_val =security_secid_to_secctx (secid, &secctx, &secctx_len); +lsmblob_init (&le, secid); + ret_val =security_secid_to_secctx (&le, &secctx, &secctx_len);if (ret_val !=0 ) goto list_cb_failure; ret_val = nla_put(cb_arg->skb,net/netlabel/netlabel_user.c +3
-3@@ -100,6 +100,7 @@ struct audit_buffer *netlbl_audit_start_common(int type,struct audit_buffer *audit_buf;char *secctx;u32 secctx_len; +struct lsmblob le;if (audit_enabled ==AUDIT_OFF )return NULL ;@@ -112,10 +113,9 @@ struct audit_buffer *netlbl_audit_start_common(int type,from_kuid (&init_user_ns, audit_info->loginuid), audit_info->sessionid); +lsmblob_init (&le, audit_info->secid);if (audit_info->secid !=0 && -security_secid_to_secctx (audit_info->secid, - &secctx, - &secctx_len) ==0 ) { +security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," subj=%s" , secctx);security_release_secctx (secctx, secctx_len); }security/security.c +11
-3@@ -1987,10 +1987,18 @@ int security_ismaclabel(const char *name) }EXPORT_SYMBOL (security_ismaclabel); -int security_secid_to_secctx (u32 secid,char **secdata,u32 *seclen) +int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen) { -return call_int_hook (secid_to_secctx, -EOPNOTSUPP , secid, secdata, - seclen); +struct security_hook_list *hp; +int rc; + +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) { + rc = hp->hook.secid_to_secctx (l->secid[hp->slot], + secdata, seclen); +if (rc !=0 ) +return rc; + } +return 0 ; }EXPORT_SYMBOL (security_secid_to_secctx);Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerPATCH v2 10/25 LSM: Use lsmblob in security_ipc_getsecid
In reply to Casey SchauflerThere may be more than one LSM that provides IPC data for auditing. Change security_ipc_getsecid() to fill in a lsmblob structure instead of the u32 secid. The audit data structure containing the secid will be updated later, so there is a bit of scaffolding here.
--- include/linux/security.h | 7 ++++--- kernel/auditsc.c | 5 ++++- security/security.c | 9 ++++++--- 3 files changed, 14 insertions(+), 7 deletions(-)
include/linux/security.h +4 -3
@@ -413,7 +413,7 @@ int security_task_prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5);void security_task_to_inode (struct task_struct *p,struct inode *inode);int security_ipc_permission (struct kern_ipc_perm *ipcp,short flag); -void security_ipc_getsecid (struct kern_ipc_perm *ipcp,u32 *secid); +void security_ipc_getsecid (struct kern_ipc_perm *ipcp,struct lsmblob *l);int security_msg_msg_alloc (struct msg_msg *msg);void security_msg_msg_free (struct msg_msg *msg);int security_msg_queue_alloc (struct kern_ipc_perm *msq);
@@ -1098,9 +1098,10 @@ static inline int security_ipc_permission(struct kern_ipc_perm *ipcp,return 0 ; } -static inline void security_ipc_getsecid (struct kern_ipc_perm *ipcp,u32 *secid) +static inline void security_ipc_getsecid (struct kern_ipc_perm *ipcp, +struct lsmblob *l) { - *secid =0 ; +lsmblob_init (l,0 ); }static inline int security_msg_msg_alloc (struct msg_msg *msg)
kernel/auditsc.c +4 -1
@@ -2266,11 +2266,14 @@ void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)void __audit_ipc_obj (struct kern_ipc_perm *ipcp) {struct audit_context *context =audit_context (); +struct lsmblob le; context->ipc.uid = ipcp->uid; context->ipc.gid = ipcp->gid; context->ipc.mode = ipcp->mode; context->ipc.has_perm =0 ; -security_ipc_getsecid (ipcp, &context->ipc.osid); +security_ipc_getsecid (ipcp, &le); +/* scaffolding on the [1] - change "osid" to a lsmblob */ + context->ipc.osid = le.secid[1 ]; context->type =AUDIT_IPC ; }
security/security.c +6 -3
@@ -1807,10 +1807,13 @@ int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag)return call_int_hook (ipc_permission,0 , ipcp, flag); } -void security_ipc_getsecid (struct kern_ipc_perm *ipcp,u32 *secid) +void security_ipc_getsecid (struct kern_ipc_perm *ipcp,struct lsmblob *l) { - *secid =0 ; -call_void_hook (ipc_getsecid, ipcp, secid); +struct security_hook_list *hp; + +lsmblob_init (l,0 ); +hlist_for_each_entry (hp, &security_hook_heads.ipc_getsecid, list) + hp->hook.ipc_getsecid (ipcp, &l->secid[hp->slot]); }int security_msg_msg_alloc (struct msg_msg *msg)
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 11/25 LSM: Use lsmblob in security_task_getsecid
In reply to Casey SchauflerChange the security_task_getsecid() interface to fill in a lsmblob structure instead of a u32 secid in support of LSM stacking. Audit interfaces will need to collect all possible secids for possible reporting.
--- drivers/android/binder.c | 4 +--- include/linux/security.h | 7 +++--- kernel/audit.c | 6 ++---- kernel/auditfilter.c | 4 +--- kernel/auditsc.c | 22 +++++++++++++------ net/netlabel/netlabel_unlabeled.c | 5 ++++- net/netlabel/netlabel_user.h | 6 +++++- security/integrity/ima/ima_appraise.c | 4 +++- security/integrity/ima/ima_main.c | 31 ++++++++++++++++----------- security/security.c | 9 +++++--- 10 files changed, 59 insertions(+), 39 deletions(-)
drivers/android/binder.c +1 -3
@@ -3119,11 +3119,9 @@ static void binder_transaction(struct binder_proc *proc, t->priority =task_nice (current);if (target_node && target_node->txn_security_ctx) { -u32 secid;struct lsmblob le; -security_task_getsecid (proc->tsk, &secid); -lsmblob_init (&le, secid); +security_task_getsecid (proc->tsk, &le); ret =security_secid_to_secctx (&le, &secctx, &secctx_sz);if (ret) { return_error =BR_FAILED_REPLY ;
include/linux/security.h +4 -3
@@ -396,7 +396,7 @@ int security_task_fix_setuid(struct cred *new, const struct cred *old,int security_task_setpgid (struct task_struct *p,pid_t pgid);int security_task_getpgid (struct task_struct *p);int security_task_getsid (struct task_struct *p); -void security_task_getsecid (struct task_struct *p,u32 *secid); +void security_task_getsecid (struct task_struct *p,struct lsmblob *l);int security_task_setnice (struct task_struct *p,int nice);int security_task_setioprio (struct task_struct *p,int ioprio);int security_task_getioprio (struct task_struct *p);
@@ -1025,9 +1025,10 @@ static inline int security_task_getsid(struct task_struct *p)return 0 ; } -static inline void security_task_getsecid (struct task_struct *p,u32 *secid) +static inline void security_task_getsecid (struct task_struct *p, +struct lsmblob *l) { - *secid =0 ; +lsmblob_init (l,0 ); }static inline int security_task_setnice (struct task_struct *p,int nice)
kernel/audit.c +2 -4
@@ -2075,14 +2075,12 @@ int audit_log_task_context(struct audit_buffer *ab)char *ctx =NULL ;unsigned len;int error; -u32 sid;struct lsmblob le; -security_task_getsecid (current, &sid); -if (!sid) +security_task_getsecid (current, &le); +if (!lsmblob_is_set (&le))return 0 ; -lsmblob_init (&le, sid); error =security_secid_to_secctx (&le, &ctx, &len);if (error) {if (error != -EINVAL )
kernel/auditfilter.c +1 -3
@@ -1323,7 +1323,6 @@ int audit_filter(int msgtype, unsigned int listtype)for (i =0 ; i < e->rule.field_count; i++) {struct audit_field *f = &e->rule.fields[i];pid_t pid; -u32 sid;struct lsmblob le;switch (f->type) {
@@ -1354,8 +1353,7 @@ int audit_filter(int msgtype, unsigned int listtype)case AUDIT_SUBJ_SEN :case AUDIT_SUBJ_CLR :if (f->lsm_rule) { -security_task_getsecid (current, &sid); -lsmblob_init (&le, sid); +security_task_getsecid (current, &le); result =security_audit_rule_match (&le, f->type, f->op, f->lsm_rule); }
kernel/auditsc.c +15 -7
@@ -444,7 +444,6 @@ static int audit_filter_rules(struct task_struct *tsk, {const struct cred *cred;int i, need_sid =1 ; -u32 sid;struct lsmblob le;unsigned int sessionid;
@@ -628,10 +627,9 @@ static int audit_filter_rules(struct task_struct *tsk,logged upon error */ if (f->lsm_rule) {if (need_sid) { -security_task_getsecid (tsk, &sid); +security_task_getsecid (tsk, &le); need_sid =0 ; } -lsmblob_init (&le, sid); result =security_audit_rule_match (&le, f->type, f->op, f->lsm_rule);
@@ -2363,12 +2361,15 @@ int __audit_sockaddr(int len, void *a)void __audit_ptrace (struct task_struct *t) {struct audit_context *context =audit_context (); +struct lsmblob le; context->target_pid =task_tgid_nr (t); context->target_auid =audit_get_loginuid (t); context->target_uid =task_uid (t); context->target_sessionid =audit_get_sessionid (t); -security_task_getsecid (t, &context->target_sid); +security_task_getsecid (t, &le); +/* scaffolding - until target_sid is converted */ + context->target_sid = le.secid[1 ];memcpy (context->target_comm, t->comm,TASK_COMM_LEN ); }
@@ -2385,6 +2386,7 @@ int audit_signal_info(int sig, struct task_struct *t)struct audit_aux_data_pids *axp;struct audit_context *ctx =audit_context ();kuid_t uid =current_uid (), auid, t_uid =task_uid (t); +struct lsmblob le; if (auditd_test_task(t) && (sig == SIGTERM || sig == SIGHUP ||
@@ -2395,7 +2397,9 @@ int audit_signal_info(int sig, struct task_struct *t) audit_sig_uid = auid; else audit_sig_uid = uid; -security_task_getsecid (current, &audit_sig_sid); +security_task_getsecid (current, &le); +/* scaffolding until audit_sig_sid is converted */ + audit_sig_sid = le.secid[1 ]; }if (!audit_signals ||audit_dummy_context ())
@@ -2408,7 +2412,9 @@ int audit_signal_info(int sig, struct task_struct *t) ctx->target_auid =audit_get_loginuid (t); ctx->target_uid = t_uid; ctx->target_sessionid =audit_get_sessionid (t); -security_task_getsecid (t, &ctx->target_sid); +security_task_getsecid (t, &le); +/* scaffolding until target_sid is converted */ + ctx->target_sid = le.secid[1 ];memcpy (ctx->target_comm, t->comm,TASK_COMM_LEN );return 0 ; }
@@ -2429,7 +2435,9 @@ int audit_signal_info(int sig, struct task_struct *t) axp->target_auid[axp->pid_count] =audit_get_loginuid (t); axp->target_uid[axp->pid_count] = t_uid; axp->target_sessionid[axp->pid_count] =audit_get_sessionid (t); -security_task_getsecid (t, &axp->target_sid[axp->pid_count]); +security_task_getsecid (t, &le); +/* scaffolding until target_sid is converted */ + axp->target_sid[axp->pid_count] = le.secid[1 ];memcpy (axp->target_comm[axp->pid_count], t->comm,TASK_COMM_LEN ); axp->pid_count++;
net/netlabel/netlabel_unlabeled.c +4 -1
@@ -1552,11 +1552,14 @@ int __init netlbl_unlabel_defconf(void)int ret_val;struct netlbl_dom_map *entry;struct netlbl_audit audit_info; +struct lsmblob le;/* Only the kernel is allowed to call this function and the only time * it is called is at bootup before the audit subsystem is reporting * messages so don't worry to much about these values. */ -security_task_getsecid (current, &audit_info.secid); +security_task_getsecid (current, &le); +/* scaffolding until audit_info.secid is converted */ + audit_info.secid = le.secid[1 ]; audit_info.loginuid =GLOBAL_ROOT_UID ; audit_info.sessionid =0 ;
net/netlabel/netlabel_user.h +5 -1
@@ -48,7 +48,11 @@static inline void netlbl_netlink_auditinfo (struct sk_buff *skb,struct netlbl_audit *audit_info) { -security_task_getsecid (current, &audit_info->secid); +struct lsmblob le; + +security_task_getsecid (current, &le); +/* scaffolding until secid is converted */ + audit_info->secid = le.secid[1 ]; audit_info->loginuid =audit_get_loginuid (current); audit_info->sessionid =audit_get_sessionid (current); }
security/integrity/ima/ima_appraise.c +3 -1
@@ -51,11 +51,13 @@ bool is_ima_appraise_enabled(void)int ima_must_appraise (struct inode *inode,int mask,enum ima_hooks func) {u32 secid; +struct lsmblob le;if (!ima_appraise)return 0 ; -security_task_getsecid (current, &secid); +security_task_getsecid (current, &le); +lsmblob_secid (&le, &secid);return ima_match_policy (inode,current_cred (), secid, func, mask,IMA_APPRAISE |IMA_HASH ,NULL ); }
security/integrity/ima/ima_main.c +18 -13
@@ -335,12 +335,13 @@ static int process_measurement(struct file *file, const struct cred *cred,*/ int ima_file_mmap (struct file *file,unsigned long prot) { -u32 secid; +struct lsmblob le;if (file && (prot &PROT_EXEC )) { -security_task_getsecid (current, &secid); -return process_measurement (file,current_cred (), secid,NULL , -0 ,MAY_EXEC ,MMAP_CHECK ); +security_task_getsecid (current, &le); +/* scaffolding - until process_measurement changes */ +return process_measurement (file,current_cred (), le.secid[1 ], +NULL ,0 ,MAY_EXEC ,MMAP_CHECK ); }return 0 ;
@@ -363,10 +364,12 @@ int ima_bprm_check(struct linux_binprm *bprm) {int ret;u32 secid; +struct lsmblob le; -security_task_getsecid (current, &secid); - ret =process_measurement (bprm->file,current_cred (), secid,NULL ,0 , -MAY_EXEC ,BPRM_CHECK ); +security_task_getsecid (current, &le); +/* scaffolding until process_measurement changes */ + ret =process_measurement (bprm->file,current_cred (), le.secid[1 ], +NULL ,0 ,MAY_EXEC ,BPRM_CHECK );if (ret)return ret;
@@ -387,10 +390,11 @@ int ima_bprm_check(struct linux_binprm *bprm)*/ int ima_file_check (struct file *file,int mask) { -u32 secid; +struct lsmblob le; -security_task_getsecid (current, &secid); -return process_measurement (file,current_cred (), secid,NULL ,0 , +security_task_getsecid (current, &le); +/* scaffolding until process_measurement changes */ +return process_measurement (file,current_cred (), le.secid[1 ],NULL ,0 , mask & (MAY_READ |MAY_WRITE |MAY_EXEC |MAY_APPEND ),FILE_CHECK ); }
@@ -499,7 +503,7 @@ int ima_post_read_file(struct file *file, void *buf, loff_t size, enum kernel_read_file_id read_id) {enum ima_hooks func; -u32 secid; +struct lsmblob le;if (!file && read_id ==READING_FIRMWARE ) { if ((ima_appraise & IMA_APPRAISE_FIRMWARE) &&
@@ -521,8 +525,9 @@ int ima_post_read_file(struct file *file, void *buf, loff_t size, } func = read_idmap[read_id] ?:FILE_CHECK ; -security_task_getsecid (current, &secid); -return process_measurement (file,current_cred (), secid, buf, size, +security_task_getsecid (current, &le); +/* scaffolding until process_measurement changes */ +return process_measurement (file,current_cred (), le.secid[1 ], buf, size,MAY_READ , func); }
security/security.c +6 -3
@@ -1724,10 +1724,13 @@ int security_task_getsid(struct task_struct *p)return call_int_hook (task_getsid,0 , p); } -void security_task_getsecid (struct task_struct *p,u32 *secid) +void security_task_getsecid (struct task_struct *p,struct lsmblob *l) { - *secid =0 ; -call_void_hook (task_getsecid, p, secid); +struct security_hook_list *hp; + +lsmblob_init (l,0 ); +hlist_for_each_entry (hp, &security_hook_heads.task_getsecid, list) + hp->hook.task_getsecid (p, &l->secid[hp->slot]); }EXPORT_SYMBOL (security_task_getsecid);
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 12/25 LSM: Use lsmblob in security_inode_getsecid
In reply to Casey SchauflerChange the security_inode_getsecid() interface to fill in a lsmblob structure instead of a u32 secid. This allows for its callers to gather data from all registered LSMs. Data is provided for IMA and audit.
--- include/linux/security.h | 7 ++++--- kernel/auditsc.c | 6 +++++- security/integrity/ima/ima_policy.c | 4 +--- security/security.c | 8 ++++++-- 4 files changed, 16 insertions(+), 9 deletions(-)
include/linux/security.h +4 -3
@@ -358,7 +358,7 @@ int security_inode_killpriv(struct dentry *dentry);int security_inode_getsecurity (struct inode *inode,const char *name,void **buffer,bool alloc);int security_inode_setsecurity (struct inode *inode,const char *name,const void *value,size_t size,int flags);int security_inode_listsecurity (struct inode *inode,char *buffer,size_t buffer_size); -void security_inode_getsecid (struct inode *inode,u32 *secid); +void security_inode_getsecid (struct inode *inode,struct lsmblob *l);int security_inode_copy_up (struct dentry *src,struct cred **new);int security_inode_copy_up_xattr (const char *name);int security_file_permission (struct file *file,int mask);
@@ -854,9 +854,10 @@ static inline int security_inode_listsecurity(struct inode *inode, char *buffer,return 0 ; } -static inline void security_inode_getsecid (struct inode *inode,u32 *secid) +static inline void security_inode_getsecid (struct inode *inode, +struct lsmblob *l) { - *secid =0 ; +lsmblob_init (l,0 ); }static inline int security_inode_copy_up (struct dentry *src,struct cred **new)
kernel/auditsc.c +5 -1
@@ -1908,13 +1908,17 @@ static inline int audit_copy_fcaps(struct audit_names *name,void audit_copy_inode (struct audit_names *name,const struct dentry *dentry,struct inode *inode,unsigned int flags) { +struct lsmblob le; + name->ino = inode->i_ino; name->dev = inode->i_sb->s_dev; name->mode = inode->i_mode; name->uid = inode->i_uid; name->gid = inode->i_gid; name->rdev = inode->i_rdev; -security_inode_getsecid (inode, &name->osid); +security_inode_getsecid (inode, &le); +/* scaffolding until osid is updated */ + name->osid = le.secid[1 ];if (flags &AUDIT_INODE_NOEVAL ) { name->fcap_ver =-1 ;return ;
security/integrity/ima/ima_policy.c +1 -3
@@ -326,7 +326,6 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode,return false;for (i =0 ; i <MAX_LSM_RULES ; i++) {int rc =0 ; -u32 osid;struct lsmblob le;int retried =0 ;
@@ -337,8 +336,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode,case LSM_OBJ_USER :case LSM_OBJ_ROLE :case LSM_OBJ_TYPE : -security_inode_getsecid (inode, &osid); -lsmblob_init (&le, osid); +security_inode_getsecid (inode, &le); rc = security_filter_rule_match(&le, rule->lsm[i].type, Audit_equal,
security/security.c +6 -2
@@ -1418,9 +1418,13 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer }EXPORT_SYMBOL (security_inode_listsecurity); -void security_inode_getsecid (struct inode *inode,u32 *secid) +void security_inode_getsecid (struct inode *inode,struct lsmblob *l) { -call_void_hook (inode_getsecid, inode, secid); +struct security_hook_list *hp; + +lsmblob_init (l,0 ); +hlist_for_each_entry (hp, &security_hook_heads.inode_getsecid, list) + hp->hook.inode_getsecid (inode, &l->secid[hp->slot]); }int security_inode_copy_up (struct dentry *src,struct cred **new)
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 13/25 LSM: Use lsmblob in security_cred_getsecid
In reply to Casey SchauflerChange the security_cred_getsecid() interface to fill in a lsmblob instead of a u32 secid. The associated data elements in the audit sub-system are changed from a secid to a lsmblob to accomodate multiple possible LSM audit users.
--- include/linux/security.h | 2 +- kernel/audit.c | 14 +++++------- kernel/audit.h | 5 +++-- kernel/auditsc.c | 37 +++++++++++-------------------- security/integrity/ima/ima_main.c | 6 ++--- security/security.c | 9 +++++--- 6 files changed, 32 insertions(+), 41 deletions(-)
include/linux/security.h +1 -1
@@ -383,7 +383,7 @@ int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);void security_cred_free (struct cred *cred);int security_prepare_creds (struct cred *new,const struct cred *old,gfp_t gfp);void security_transfer_creds (struct cred *new,const struct cred *old); -void security_cred_getsecid (const struct cred *c,u32 *secid); +void security_cred_getsecid (const struct cred *c,struct lsmblob *l);int security_kernel_act_as (struct cred *new,struct lsmblob *l);int security_kernel_create_files_as (struct cred *new,struct inode *inode);int security_kernel_module_request (char *kmod_name);
kernel/audit.c +6 -8
@@ -137,7 +137,7 @@ static u32 audit_backlog_wait_time = AUDIT_BACKLOG_WAIT_TIME;/* The identity of the user shutting down the audit system. */ kuid_t audit_sig_uid =INVALID_UID ;pid_t audit_sig_pid =-1 ; -u32 audit_sig_sid =0 ; +struct lsmblob audit_sig_lsm;/* Records can be lost in several ways: 0) [suppressed in audit_alloc]
@@ -1429,23 +1429,21 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) }case AUDIT_SIGNAL_INFO : len =0 ; -if (audit_sig_sid) { -struct lsmblob le; - -lsmblob_init (&le, audit_sig_sid); - err =security_secid_to_secctx (&le, &ctx, &len); +if (lsmblob_is_set (&audit_sig_lsm)) { + err =security_secid_to_secctx (&audit_sig_lsm, &ctx, + &len);if (err)return err; } sig_data =kmalloc (sizeof (*sig_data) + len,GFP_KERNEL );if (!sig_data) { -if (audit_sig_sid) +if (lsmblob_is_set (&audit_sig_lsm))security_release_secctx (ctx, len);return -ENOMEM ; } sig_data->uid =from_kuid (&init_user_ns, audit_sig_uid); sig_data->pid = audit_sig_pid; -if (audit_sig_sid) { +if (lsmblob_is_set (&audit_sig_lsm)) {memcpy (sig_data->ctx, ctx, len);security_release_secctx (ctx, len); }
kernel/audit.h +3 -2
@@ -22,6 +22,7 @@#include <linux/fs.h> #include <linux/audit.h> #include <linux/skbuff.h> +#include <linux/security.h> #include <uapi/linux/mqueue.h> #include <linux/tty.h>
@@ -147,7 +148,7 @@ struct audit_context {kuid_t target_auid;kuid_t target_uid;unsigned int target_sessionid; -u32 target_sid; +struct lsmblob target_lsm;char target_comm[TASK_COMM_LEN ];struct audit_tree_refs *trees, *first_trees;
@@ -338,7 +339,7 @@ extern char *audit_unpack_string(void **bufp, size_t *remain, size_t len);extern pid_t audit_sig_pid;extern kuid_t audit_sig_uid; -extern u32 audit_sig_sid; +extern struct lsmblob audit_sig_lsm;extern int audit_filter (int msgtype,unsigned int listtype);
kernel/auditsc.c +13 -24
@@ -112,7 +112,7 @@ struct audit_aux_data_pids {kuid_t target_auid[AUDIT_AUX_PIDS ];kuid_t target_uid[AUDIT_AUX_PIDS ];unsigned int target_sessionid[AUDIT_AUX_PIDS ]; -u32 target_sid[AUDIT_AUX_PIDS ]; +struct lsmblob target_lsm[AUDIT_AUX_PIDS ];char target_comm[AUDIT_AUX_PIDS ][TASK_COMM_LEN ];int pid_count; };
@@ -937,14 +937,14 @@ static inline void audit_free_context(struct audit_context *context) }static int audit_log_pid_context (struct audit_context *context,pid_t pid, -kuid_t auid,kuid_t uid,unsigned int sessionid, -u32 sid,char *comm) +kuid_t auid,kuid_t uid, +unsigned int sessionid, +struct lsmblob *l,char *comm) {struct audit_buffer *ab;char *ctx =NULL ;u32 len;int rc =0 ; -struct lsmblob le; ab =audit_log_start (context,GFP_KERNEL ,AUDIT_OBJ_PID );if (!ab)
@@ -953,9 +953,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,audit_log_format (ab,"opid=%d oauid=%d ouid=%d oses=%d" , pid,from_kuid (&init_user_ns, auid),from_kuid (&init_user_ns, uid), sessionid); -if (sid) { -lsmblob_init (&le, sid); -if (security_secid_to_secctx (&le, &ctx, &len)) { +if (lsmblob_is_set (l)) { +if (security_secid_to_secctx (l, &ctx, &len)) {audit_log_format (ab," obj=(none)" ); rc =1 ; }else {
@@ -1525,7 +1524,7 @@ static void audit_log_exit(void) axs->target_auid[i], axs->target_uid[i], axs->target_sessionid[i], - axs->target_sid[i], + &axs->target_lsm[i], axs->target_comm[i])) call_panic = 1; }
@@ -1534,7 +1533,7 @@ static void audit_log_exit(void)audit_log_pid_context (context, context->target_pid, context->target_auid, context->target_uid, context->target_sessionid, - context->target_sid, context->target_comm)) + &context->target_lsm, context->target_comm)) call_panic = 1;if (context->pwd.dentry && context->pwd.mnt) {
@@ -1711,7 +1710,7 @@ void __audit_syscall_exit(int success, long return_code) context->aux =NULL ; context->aux_pids =NULL ; context->target_pid =0 ; - context->target_sid =0 ; +lsmblob_init (&context->target_lsm,0 ); context->sockaddr_len =0 ; context->type =0 ; context->fds[0 ] =-1 ;
@@ -2365,15 +2364,12 @@ int __audit_sockaddr(int len, void *a)void __audit_ptrace (struct task_struct *t) {struct audit_context *context =audit_context (); -struct lsmblob le; context->target_pid =task_tgid_nr (t); context->target_auid =audit_get_loginuid (t); context->target_uid =task_uid (t); context->target_sessionid =audit_get_sessionid (t); -security_task_getsecid (t, &le); -/* scaffolding - until target_sid is converted */ - context->target_sid = le.secid[1 ]; +security_task_getsecid (t, &context->target_lsm);memcpy (context->target_comm, t->comm,TASK_COMM_LEN ); }
@@ -2390,7 +2386,6 @@ int audit_signal_info(int sig, struct task_struct *t)struct audit_aux_data_pids *axp;struct audit_context *ctx =audit_context ();kuid_t uid =current_uid (), auid, t_uid =task_uid (t); -struct lsmblob le; if (auditd_test_task(t) && (sig == SIGTERM || sig == SIGHUP ||
@@ -2401,9 +2396,7 @@ int audit_signal_info(int sig, struct task_struct *t) audit_sig_uid = auid; else audit_sig_uid = uid; -security_task_getsecid (current, &le); -/* scaffolding until audit_sig_sid is converted */ - audit_sig_sid = le.secid[1 ]; +security_task_getsecid (current, &audit_sig_lsm); }if (!audit_signals ||audit_dummy_context ())
@@ -2416,9 +2409,7 @@ int audit_signal_info(int sig, struct task_struct *t) ctx->target_auid =audit_get_loginuid (t); ctx->target_uid = t_uid; ctx->target_sessionid =audit_get_sessionid (t); -security_task_getsecid (t, &le); -/* scaffolding until target_sid is converted */ - ctx->target_sid = le.secid[1 ]; +security_task_getsecid (t, &ctx->target_lsm);memcpy (ctx->target_comm, t->comm,TASK_COMM_LEN );return 0 ; }
@@ -2439,9 +2430,7 @@ int audit_signal_info(int sig, struct task_struct *t) axp->target_auid[axp->pid_count] =audit_get_loginuid (t); axp->target_uid[axp->pid_count] = t_uid; axp->target_sessionid[axp->pid_count] =audit_get_sessionid (t); -security_task_getsecid (t, &le); -/* scaffolding until target_sid is converted */ - axp->target_sid[axp->pid_count] = le.secid[1 ]; +security_task_getsecid (t, &axp->target_lsm[axp->pid_count]);memcpy (axp->target_comm[axp->pid_count], t->comm,TASK_COMM_LEN ); axp->pid_count++;
security/integrity/ima/ima_main.c +3 -3
@@ -363,7 +363,6 @@ int ima_file_mmap(struct file *file, unsigned long prot)int ima_bprm_check (struct linux_binprm *bprm) {int ret; -u32 secid;struct lsmblob le;security_task_getsecid (current, &le);
@@ -373,8 +372,9 @@ int ima_bprm_check(struct linux_binprm *bprm)if (ret)return ret; -security_cred_getsecid (bprm->cred, &secid); -return process_measurement (bprm->file, bprm->cred, secid,NULL ,0 , +security_cred_getsecid (bprm->cred, &le); +/* scaffolding until process_measurement changes */ +return process_measurement (bprm->file, bprm->cred, le.secid[1 ],NULL ,0 ,MAY_EXEC ,CREDS_CHECK ); }
security/security.c +6 -3
@@ -1638,10 +1638,13 @@ void security_transfer_creds(struct cred *new, const struct cred *old)call_void_hook (cred_transfer, new, old); } -void security_cred_getsecid (const struct cred *c,u32 *secid) +void security_cred_getsecid (const struct cred *c,struct lsmblob *l) { - *secid =0 ; -call_void_hook (cred_getsecid, c, secid); +struct security_hook_list *hp; + +lsmblob_init (l,0 ); +hlist_for_each_entry (hp, &security_hook_heads.cred_getsecid, list) + hp->hook.cred_getsecid (c, &l->secid[hp->slot]); }EXPORT_SYMBOL (security_cred_getsecid);
Signature · 1 line
2.20.1
Re: [PATCH v2 13/25] LSM: Use lsmblob in security_cred_getsecid
Quoted 4 lines · Casey Schaufler
Change the
security_cred_getsecid()interface to fill in a lsmblob instead of a u32 secid. The associated data elements in the audit sub-system are changed from a secid to a lsmblob to accomodate multiple possible LSM audit users.
Cool, cool. I'm digging the clean conversions all the way through this patch. I didn't see patch 14/25 for some reason, though...
-Kees
Quoted 272 lines
Signed-off-by Casey Schaufler <[email protected]>--- include/linux/security.h | 2 +- kernel/audit.c | 14 +++++------- kernel/audit.h | 5 +++-- kernel/auditsc.c | 37 +++++++++++-------------------- security/integrity/ima/ima_main.c | 6 ++--- security/security.c | 9 +++++--- 6 files changed, 32 insertions(+), 41 deletions(-)include/linux/security.h +1
-1@@ -383,7 +383,7 @@ int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);void security_cred_free (struct cred *cred);int security_prepare_creds (struct cred *new,const struct cred *old,gfp_t gfp);void security_transfer_creds (struct cred *new,const struct cred *old); -void security_cred_getsecid (const struct cred *c,u32 *secid); +void security_cred_getsecid (const struct cred *c,struct lsmblob *l);int security_kernel_act_as (struct cred *new,struct lsmblob *l);int security_kernel_create_files_as (struct cred *new,struct inode *inode);int security_kernel_module_request (char *kmod_name);kernel/audit.c +6
-8@@ -137,7 +137,7 @@ static u32 audit_backlog_wait_time = AUDIT_BACKLOG_WAIT_TIME;/* The identity of the user shutting down the audit system. */ kuid_t audit_sig_uid =INVALID_UID ;pid_t audit_sig_pid =-1 ; -u32 audit_sig_sid =0 ; +struct lsmblob audit_sig_lsm;/* Records can be lost in several ways: 0) [suppressed in audit_alloc] @@ -1429,23 +1429,21 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) }case AUDIT_SIGNAL_INFO : len =0 ; -if (audit_sig_sid) { -struct lsmblob le; - -lsmblob_init (&le, audit_sig_sid); - err =security_secid_to_secctx (&le, &ctx, &len); +if (lsmblob_is_set (&audit_sig_lsm)) { + err =security_secid_to_secctx (&audit_sig_lsm, &ctx, + &len);if (err)return err; } sig_data =kmalloc (sizeof (*sig_data) + len,GFP_KERNEL );if (!sig_data) { -if (audit_sig_sid) +if (lsmblob_is_set (&audit_sig_lsm))security_release_secctx (ctx, len);return -ENOMEM ; } sig_data->uid =from_kuid (&init_user_ns, audit_sig_uid); sig_data->pid = audit_sig_pid; -if (audit_sig_sid) { +if (lsmblob_is_set (&audit_sig_lsm)) {memcpy (sig_data->ctx, ctx, len);security_release_secctx (ctx, len); }kernel/audit.h +3
-2@@ -22,6 +22,7 @@#include <linux/fs.h> #include <linux/audit.h> #include <linux/skbuff.h> +#include <linux/security.h> #include <uapi/linux/mqueue.h> #include <linux/tty.h> @@ -147,7 +148,7 @@ struct audit_context {kuid_t target_auid;kuid_t target_uid;unsigned int target_sessionid; -u32 target_sid; +struct lsmblob target_lsm;char target_comm[TASK_COMM_LEN ];struct audit_tree_refs *trees, *first_trees;@@ -338,7 +339,7 @@ extern char *audit_unpack_string(void **bufp, size_t *remain, size_t len);extern pid_t audit_sig_pid;extern kuid_t audit_sig_uid; -extern u32 audit_sig_sid; +extern struct lsmblob audit_sig_lsm;extern int audit_filter (int msgtype,unsigned int listtype);kernel/auditsc.c +13
-24@@ -112,7 +112,7 @@ struct audit_aux_data_pids {kuid_t target_auid[AUDIT_AUX_PIDS ];kuid_t target_uid[AUDIT_AUX_PIDS ];unsigned int target_sessionid[AUDIT_AUX_PIDS ]; -u32 target_sid[AUDIT_AUX_PIDS ]; +struct lsmblob target_lsm[AUDIT_AUX_PIDS ];char target_comm[AUDIT_AUX_PIDS ][TASK_COMM_LEN ];int pid_count; };@@ -937,14 +937,14 @@ static inline void audit_free_context(struct audit_context *context) }static int audit_log_pid_context (struct audit_context *context,pid_t pid, -kuid_t auid,kuid_t uid,unsigned int sessionid, -u32 sid,char *comm) +kuid_t auid,kuid_t uid, +unsigned int sessionid, +struct lsmblob *l,char *comm) {struct audit_buffer *ab;char *ctx =NULL ;u32 len;int rc =0 ; -struct lsmblob le; ab =audit_log_start (context,GFP_KERNEL ,AUDIT_OBJ_PID );if (!ab)@@ -953,9 +953,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,audit_log_format (ab,"opid=%d oauid=%d ouid=%d oses=%d" , pid,from_kuid (&init_user_ns, auid),from_kuid (&init_user_ns, uid), sessionid); -if (sid) { -lsmblob_init (&le, sid); -if (security_secid_to_secctx (&le, &ctx, &len)) { +if (lsmblob_is_set (l)) { +if (security_secid_to_secctx (l, &ctx, &len)) {audit_log_format (ab," obj=(none)" ); rc =1 ; }else {@@ -1525,7 +1524,7 @@ static void audit_log_exit(void) axs->target_auid[i], axs->target_uid[i], axs->target_sessionid[i], - axs->target_sid[i], + &axs->target_lsm[i], axs->target_comm[i])) call_panic = 1; }@@ -1534,7 +1533,7 @@ static void audit_log_exit(void)audit_log_pid_context (context, context->target_pid, context->target_auid, context->target_uid, context->target_sessionid, - context->target_sid, context->target_comm)) + &context->target_lsm, context->target_comm)) call_panic = 1;if (context->pwd.dentry && context->pwd.mnt) {@@ -1711,7 +1710,7 @@ void __audit_syscall_exit(int success, long return_code) context->aux =NULL ; context->aux_pids =NULL ; context->target_pid =0 ; - context->target_sid =0 ; +lsmblob_init (&context->target_lsm,0 ); context->sockaddr_len =0 ; context->type =0 ; context->fds[0 ] =-1 ;@@ -2365,15 +2364,12 @@ int __audit_sockaddr(int len, void *a)void __audit_ptrace (struct task_struct *t) {struct audit_context *context =audit_context (); -struct lsmblob le; context->target_pid =task_tgid_nr (t); context->target_auid =audit_get_loginuid (t); context->target_uid =task_uid (t); context->target_sessionid =audit_get_sessionid (t); -security_task_getsecid (t, &le); -/* scaffolding - until target_sid is converted */ - context->target_sid = le.secid[1 ]; +security_task_getsecid (t, &context->target_lsm);memcpy (context->target_comm, t->comm,TASK_COMM_LEN ); }@@ -2390,7 +2386,6 @@ int audit_signal_info(int sig, struct task_struct *t)struct audit_aux_data_pids *axp;struct audit_context *ctx =audit_context ();kuid_t uid =current_uid (), auid, t_uid =task_uid (t); -struct lsmblob le; if (auditd_test_task(t) && (sig == SIGTERM || sig == SIGHUP ||@@ -2401,9 +2396,7 @@ int audit_signal_info(int sig, struct task_struct *t) audit_sig_uid = auid; else audit_sig_uid = uid; -security_task_getsecid (current, &le); -/* scaffolding until audit_sig_sid is converted */ - audit_sig_sid = le.secid[1 ]; +security_task_getsecid (current, &audit_sig_lsm); }if (!audit_signals ||audit_dummy_context ())@@ -2416,9 +2409,7 @@ int audit_signal_info(int sig, struct task_struct *t) ctx->target_auid =audit_get_loginuid (t); ctx->target_uid = t_uid; ctx->target_sessionid =audit_get_sessionid (t); -security_task_getsecid (t, &le); -/* scaffolding until target_sid is converted */ - ctx->target_sid = le.secid[1 ]; +security_task_getsecid (t, &ctx->target_lsm);memcpy (ctx->target_comm, t->comm,TASK_COMM_LEN );return 0 ; }@@ -2439,9 +2430,7 @@ int audit_signal_info(int sig, struct task_struct *t) axp->target_auid[axp->pid_count] =audit_get_loginuid (t); axp->target_uid[axp->pid_count] = t_uid; axp->target_sessionid[axp->pid_count] =audit_get_sessionid (t); -security_task_getsecid (t, &le); -/* scaffolding until target_sid is converted */ - axp->target_sid[axp->pid_count] = le.secid[1 ]; +security_task_getsecid (t, &axp->target_lsm[axp->pid_count]);memcpy (axp->target_comm[axp->pid_count], t->comm,TASK_COMM_LEN ); axp->pid_count++;security/integrity/ima/ima_main.c +3
-3@@ -363,7 +363,6 @@ int ima_file_mmap(struct file *file, unsigned long prot)int ima_bprm_check (struct linux_binprm *bprm) {int ret; -u32 secid;struct lsmblob le;security_task_getsecid (current, &le);@@ -373,8 +372,9 @@ int ima_bprm_check(struct linux_binprm *bprm)if (ret)return ret; -security_cred_getsecid (bprm->cred, &secid); -return process_measurement (bprm->file, bprm->cred, secid,NULL ,0 , +security_cred_getsecid (bprm->cred, &le); +/* scaffolding until process_measurement changes */ +return process_measurement (bprm->file, bprm->cred, le.secid[1 ],NULL ,0 ,MAY_EXEC ,CREDS_CHECK ); }security/security.c +6
-3@@ -1638,10 +1638,13 @@ void security_transfer_creds(struct cred *new, const struct cred *old)call_void_hook (cred_transfer, new, old); } -void security_cred_getsecid (const struct cred *c,u32 *secid) +void security_cred_getsecid (const struct cred *c,struct lsmblob *l) { - *secid =0 ; -call_void_hook (cred_getsecid, c, secid); +struct security_hook_list *hp; + +lsmblob_init (l,0 ); +hlist_for_each_entry (hp, &security_hook_heads.cred_getsecid, list) + hp->hook.cred_getsecid (c, &l->secid[hp->slot]); }EXPORT_SYMBOL (security_cred_getsecid);Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerPATCH v2 14/25 IMA: Change internal interfaces to use lsmblobs
In reply to Casey SchauflerThe IMA interfaces ima_get_action() and ima_match_policy() call LSM functions that use lsmblobs. Change the IMA functions to pass the lsmblob to be compatible with the LSM functions.
--- security/integrity/ima/ima.h | 10 ++++++---- security/integrity/ima/ima_api.c | 9 +++++---- security/integrity/ima/ima_appraise.c | 4 +--- security/integrity/ima/ima_main.c | 21 ++++++++------------- security/integrity/ima/ima_policy.c | 14 +++++++------- 5 files changed, 27 insertions(+), 31 deletions(-)
security/integrity/ima/ima.h +6 -4
@@ -192,8 +192,9 @@ enum ima_hooks { };/* LIM API function definitions */ -int ima_get_action (struct inode *inode,const struct cred *cred,u32 secid, -int mask,enum ima_hooks func,int *pcr); +int ima_get_action (struct inode *inode,const struct cred *cred, +struct lsmblob *l,int mask,enum ima_hooks func, +int *pcr);int ima_must_measure (struct inode *inode,int mask,enum ima_hooks func); int ima_collect_measurement(struct integrity_iint_cache *iint, struct file *file, void *buf, loff_t size,
@@ -213,8 +214,9 @@ void ima_free_template_entry(struct ima_template_entry *entry);const char *ima_d_path (const struct path *path,char **pathbuf,char *filename);/* IMA policy related functions */ -int ima_match_policy (struct inode *inode,const struct cred *cred,u32 secid, -enum ima_hooks func,int mask,int flags,int *pcr); +int ima_match_policy (struct inode *inode,const struct cred *cred, +struct lsmblob *l,enum ima_hooks func,int mask, +int flags,int *pcr);void ima_init_policy (void );void ima_update_policy (void );void ima_update_policy_flag (void );
security/integrity/ima/ima_api.c +5 -4
@@ -159,7 +159,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename,* ima_get_action - appraise & measure decision based on policy. * @inode: pointer to inode to measure * @cred: pointer to credentials structure to validate -* @secid: secid of the task being validated +* @l: LAM data of the task being validated * @mask: contains the permission mask (MAY_READ, MAY_WRITE, MAY_EXEC, * MAY_APPEND) * @func: caller identifier
@@ -175,14 +175,15 @@ void ima_add_violation(struct file *file, const unsigned char *filename,* Returns IMA_MEASURE, IMA_APPRAISE mask. * */ -int ima_get_action (struct inode *inode,const struct cred *cred,u32 secid, -int mask,enum ima_hooks func,int *pcr) +int ima_get_action (struct inode *inode,const struct cred *cred, +struct lsmblob *l,int mask,enum ima_hooks func, +int *pcr) {int flags =IMA_MEASURE |IMA_AUDIT |IMA_APPRAISE |IMA_HASH ; flags &= ima_policy_flag; -return ima_match_policy (inode, cred, secid, func, mask, flags, pcr); +return ima_match_policy (inode, cred, l, func, mask, flags, pcr); }/*
security/integrity/ima/ima_appraise.c +1 -3
@@ -50,15 +50,13 @@ bool is_ima_appraise_enabled(void)*/ int ima_must_appraise (struct inode *inode,int mask,enum ima_hooks func) { -u32 secid;struct lsmblob le;if (!ima_appraise)return 0 ;security_task_getsecid (current, &le); -lsmblob_secid (&le, &secid); -return ima_match_policy (inode,current_cred (), secid, func, mask, +return ima_match_policy (inode,current_cred (), &le, func, mask,IMA_APPRAISE |IMA_HASH ,NULL ); }
security/integrity/ima/ima_main.c +8 -13
@@ -169,8 +169,8 @@ void ima_file_free(struct file *file) }static int process_measurement (struct file *file,const struct cred *cred, -u32 secid,char *buf,loff_t size,int mask, -enum ima_hooks func) +struct lsmblob *l,char *buf,loff_t size, +int mask,enum ima_hooks func) {struct inode *inode =file_inode (file);struct integrity_iint_cache *iint =NULL ;
@@ -192,7 +192,7 @@ static int process_measurement(struct file *file, const struct cred *cred,* bitmask based on the appraise/audit/measurement policy. * Included is the appraise submask. */ - action =ima_get_action (inode, cred, secid, mask, func, &pcr); + action =ima_get_action (inode, cred, l, mask, func, &pcr); violation_check = ((func ==FILE_CHECK || func ==MMAP_CHECK ) && (ima_policy_flag &IMA_MEASURE ));if (!action && !violation_check)
@@ -339,8 +339,7 @@ int ima_file_mmap(struct file *file, unsigned long prot)if (file && (prot &PROT_EXEC )) {security_task_getsecid (current, &le); -/* scaffolding - until process_measurement changes */ -return process_measurement (file,current_cred (), le.secid[1 ], +return process_measurement (file,current_cred (), &le,NULL ,0 ,MAY_EXEC ,MMAP_CHECK ); }
@@ -366,15 +365,13 @@ int ima_bprm_check(struct linux_binprm *bprm)struct lsmblob le;security_task_getsecid (current, &le); -/* scaffolding until process_measurement changes */ - ret =process_measurement (bprm->file,current_cred (), le.secid[1 ], + ret =process_measurement (bprm->file,current_cred (), &le,NULL ,0 ,MAY_EXEC ,BPRM_CHECK );if (ret)return ret;security_cred_getsecid (bprm->cred, &le); -/* scaffolding until process_measurement changes */ -return process_measurement (bprm->file, bprm->cred, le.secid[1 ],NULL ,0 , +return process_measurement (bprm->file, bprm->cred, &le,NULL ,0 ,MAY_EXEC ,CREDS_CHECK ); }
@@ -393,8 +390,7 @@ int ima_file_check(struct file *file, int mask)struct lsmblob le;security_task_getsecid (current, &le); -/* scaffolding until process_measurement changes */ -return process_measurement (file,current_cred (), le.secid[1 ],NULL ,0 , +return process_measurement (file,current_cred (), &le,NULL ,0 , mask & (MAY_READ |MAY_WRITE |MAY_EXEC |MAY_APPEND ),FILE_CHECK ); }
@@ -526,8 +522,7 @@ int ima_post_read_file(struct file *file, void *buf, loff_t size, func = read_idmap[read_id] ?:FILE_CHECK ;security_task_getsecid (current, &le); -/* scaffolding until process_measurement changes */ -return process_measurement (file,current_cred (), le.secid[1 ], buf, size, +return process_measurement (file,current_cred (), &le, buf, size,MAY_READ , func); }
security/integrity/ima/ima_policy.c +7 -7
@@ -286,7 +286,7 @@ static void ima_lsm_update_rules(void)* Returns true on rule match, false on failure. */ static bool ima_match_rules (struct ima_rule_entry *rule,struct inode *inode, -const struct cred *cred,u32 secid, +const struct cred *cred,struct lsmblob *l,enum ima_hooks func,int mask) {int i;
@@ -345,8 +345,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode,case LSM_SUBJ_USER :case LSM_SUBJ_ROLE :case LSM_SUBJ_TYPE : -lsmblob_init (&le, secid); - rc =security_filter_rule_match (&le, + rc =security_filter_rule_match (l, rule->lsm[i].type, Audit_equal, rule->lsm[i].rule);
@@ -394,7 +393,7 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func)* @inode: pointer to an inode for which the policy decision is being made * @cred: pointer to a credentials structure for which the policy decision is * being made -* @secid: LSM secid of the task to be validated +* @l: LSM data of the task to be validated * @func: IMA hook identifier * @mask: requested action (MAY_READ | MAY_WRITE | MAY_APPEND | MAY_EXEC) * @pcr: set the pcr to extend
@@ -406,8 +405,9 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func)* list when walking it. Reads are many orders of magnitude more numerous * than writes so ima_match_policy() is classical RCU candidate. */ -int ima_match_policy (struct inode *inode,const struct cred *cred,u32 secid, -enum ima_hooks func,int mask,int flags,int *pcr) +int ima_match_policy (struct inode *inode,const struct cred *cred, +struct lsmblob *l,enum ima_hooks func,int mask, +int flags,int *pcr) {struct ima_rule_entry *entry;int action =0 , actmask = flags | (flags <<1 );
@@ -418,7 +418,7 @@ int ima_match_policy(struct inode *inode, const struct cred *cred, u32 secid,if (!(entry->action & actmask))continue ; -if (!ima_match_rules (entry, inode, cred, secid, func, mask)) +if (!ima_match_rules (entry, inode, cred, l, func, mask))continue ; action |= entry->flags &IMA_ACTION_FLAGS ;
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 15/25 LSM: Specify which LSM to display
In reply to Casey SchauflerCreate a new entry "display" in /proc/.../attr for controlling which LSM security information is displayed for a process. The name of an active LSM that supplies hooks for human readable data may be written to "display" to set the value. The name of the LSM currently in use can be read from "display". At this point there can only be one LSM capable of display active.
This affects /proc/.../attr/current and SO_PEERSEC.
--- fs/proc/base.c | 1 + security/security.c | 108 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 88 insertions(+), 21 deletions(-)
fs/proc/base.c +1 -0
@@ -2618,6 +2618,7 @@ static const struct pid_entry attr_dir_stuff[] = {ATTR (NULL ,"fscreate" ,0666 ),ATTR (NULL ,"keycreate" ,0666 ),ATTR (NULL ,"sockcreate" ,0666 ), +ATTR (NULL ,"display" ,0666 ), #ifdef CONFIG_SECURITY_SMACKDIR ("smack" ,0555 , proc_smack_attr_dir_inode_ops, proc_smack_attr_dir_ops),
security/security.c +87 -21
186 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v2 15/25] LSM: Specify which LSM to display
Quoted 9 lines · Casey Schaufler
Create a new entry "display" in
/proc/.../attrfor controlling which LSM security information is displayed for a process. The name of an active LSM that supplies hooks for human readable data may be written to "display" to set the value. The name of the LSM currently in use can be read from "display". At this point there can only be one LSM capable of display active.This affects
/proc/.../attr/currentandSO_PEERSEC.
What happened to creating /proc/$pid/lsm/$lsm_name/current for "modern" LSM libraries to start using (instead of possibly fighting over the /proc/$pid/attr/display)? (Obviously "display" is needed for "old" libraries, and I'm fine with it.)
Similarly, is there something that can be done for SO_PEERSEC that doesn't require using "display" for "modern" libraries?
-Kees
Quoted 220 lines
Signed-off-by Casey Schaufler <[email protected]>--- fs/proc/base.c | 1 + security/security.c | 108 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 88 insertions(+), 21 deletions(-)fs/proc/base.c +1
-0@@ -2618,6 +2618,7 @@ static const struct pid_entry attr_dir_stuff[] = {ATTR (NULL ,"fscreate" ,0666 ),ATTR (NULL ,"keycreate" ,0666 ),ATTR (NULL ,"sockcreate" ,0666 ), +ATTR (NULL ,"display" ,0666 ), #ifdef CONFIG_SECURITY_SMACKDIR ("smack" ,0555 , proc_smack_attr_dir_inode_ops, proc_smack_attr_dir_ops),security/security.c +87
-21@@ -46,7 +46,9 @@ static struct kmem_cache *lsm_file_cache;static struct kmem_cache *lsm_inode_cache;char *lsm_names; -static struct lsm_blob_sizes blob_sizes __lsm_ro_after_init; +static struct lsm_blob_sizes blob_sizes __lsm_ro_after_init = { + .lbs_task =sizeof (int ), +};/* Boot-time LSM user choice */ static __initdata const char *chosen_lsm_order;@@ -578,6 +580,8 @@ int lsm_inode_alloc(struct inode *inode)*/ static int lsm_task_alloc (struct task_struct *task) { +int *display; +if (blob_sizes.lbs_task ==0 ) { task->security =NULL ;return 0 ;@@ -586,6 +590,10 @@ static int lsm_task_alloc(struct task_struct *task) task->security =kzalloc (blob_sizes.lbs_task,GFP_KERNEL );if (task->security ==NULL )return -ENOMEM ; + + display = task->security; + *display =LSMDATA_INVALID ; +return 0 ; }@@ -1574,14 +1582,27 @@ int security_file_open(struct file *file)int security_task_alloc (struct task_struct *task,unsigned long clone_flags) { +int *odisplay = current->security; +int *ndisplay;int rc =lsm_task_alloc (task); -if (rc) +if (unlikely (rc))return rc; + rc =call_int_hook (task_alloc,0 , task, clone_flags); -if (unlikely (rc)) +if (unlikely (rc)) {security_task_free (task); -return rc; +return rc; + } + + ndisplay = task->security; +if (ndisplay ==NULL ) +return 0 ; + +if (odisplay !=NULL ) + *ndisplay = *odisplay; + +return 0 ; }void security_task_free (struct task_struct *task)@@ -1967,10 +1988,28 @@ int security_getprocattr(struct task_struct *p, const char *lsm, char *name, char **value) {struct security_hook_list *hp; +int *display = current->security; + +if (!strcmp (name,"display" )) { +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, + list) { +if (*display ==LSMDATA_INVALID || + hp->slot == *display) { + *value =kstrdup (hp->lsm,GFP_KERNEL ); +if (*value) +return strlen (hp->lsm); +return -ENOMEM ; + } + } +return -EINVAL ; + }hlist_for_each_entry (hp, &security_hook_heads.getprocattr, list) {if (lsm !=NULL &&strcmp (lsm, hp->lsm))continue ; +if (lsm ==NULL && *display !=LSMDATA_INVALID && + *display != hp->slot) +continue ;return hp->hook.getprocattr (p, name, value); }return -EINVAL ;@@ -1980,10 +2019,27 @@ int security_setprocattr(const char *lsm, const char *name, void *value, size_t size) {struct security_hook_list *hp; +int *display = current->security; +int len; + +if (!strcmp (name,"display" )) { +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, + list) { + len =strlen (hp->lsm); +if (size >= len && !strncmp (value, hp->lsm, len)) { + *display = hp->slot; +return size; + } + } +return -EINVAL ; + }hlist_for_each_entry (hp, &security_hook_heads.setprocattr, list) {if (lsm !=NULL &&strcmp (lsm, hp->lsm))continue ; +if (lsm ==NULL && *display !=LSMDATA_INVALID && + *display != hp->slot) +continue ;return hp->hook.setprocattr (name, value, size); }return -EINVAL ;@@ -2002,38 +2058,41 @@ EXPORT_SYMBOL(security_ismaclabel);int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen) { +int *display = current->security;struct security_hook_list *hp; -int rc; -hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) { - rc = hp->hook.secid_to_secctx (l->secid[hp->slot], - secdata, seclen); -if (rc !=0 ) -return rc; - } +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) +return hp->hook.secid_to_secctx (l->secid[hp->slot], + secdata, seclen);return 0 ; }EXPORT_SYMBOL (security_secid_to_secctx);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *l) { +int *display = current->security;struct security_hook_list *hp; -int rc;lsmblob_init (l,0 ); -hlist_for_each_entry (hp, &security_hook_heads.secctx_to_secid, list) { - rc = hp->hook.secctx_to_secid (secdata, seclen, - &l->secid[hp->slot]); -if (rc !=0 ) -return rc; - } +hlist_for_each_entry (hp, &security_hook_heads.secctx_to_secid, list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) +return hp->hook.secctx_to_secid (secdata, seclen, + &l->secid[hp->slot]);return 0 ; }EXPORT_SYMBOL (security_secctx_to_secid);void security_release_secctx (char *secdata,u32 seclen) { -call_void_hook (release_secctx, secdata, seclen); +int *display = current->security; +struct security_hook_list *hp; + +hlist_for_each_entry (hp, &security_hook_heads.release_secctx, list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) { + hp->hook.release_secctx (secdata, seclen); +return ; + } }EXPORT_SYMBOL (security_release_secctx);@@ -2158,8 +2217,15 @@ EXPORT_SYMBOL(security_sock_rcv_skb);int security_socket_getpeersec_stream (struct socket *sock,char __user *optval,int __user *optlen,unsigned len) { -return call_int_hook (socket_getpeersec_stream, -ENOPROTOOPT , sock, - optval, optlen, len); +int *display = current->security; +struct security_hook_list *hp; + +hlist_for_each_entry (hp, &security_hook_heads.socket_getpeersec_stream, + list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) +return hp->hook.socket_getpeersec_stream (sock, optval, + optlen, len); +return -ENOPROTOOPT ; } int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb,Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerRe: [PATCH v2 15/25] LSM: Specify which LSM to display
Quoted 9 lines · Kees Cook
Quoted 8 lines · Casey Schaufler
Create a new entry "display" in
/proc/.../attrfor controlling which LSM security information is displayed for a process. The name of an active LSM that supplies hooks for human readable data may be written to "display" to set the value. The name of the LSM currently in use can be read from "display". At this point there can only be one LSM capable of display active.
Quoted 4 lines
Quoted 1 line
This affects
/proc/.../attr/currentandSO_PEERSEC.What happened to creating
/proc/$pid/lsm/$lsm_name/currentfor "modern" LSM libraries to start using (instead of possibly fighting over the/proc/$pid/attr/display)?
Smack already has it and the mechanics are available for anyone who wants to use it. John says that AppArmor is moving away from using the attr interfaces. Stephen and Paul have been silent on the topic, but my assumption is that the SELinux attitude is "I had them first, it's not my problem". When we get around to creating liblsm, with the "real" LSM user space APIs it will probably drive the addition of more /proc/$pid/lsm/$lsm_name directories.
Quoted 2 lines
(Obviously "display" is needed for "old"
libraries, and I'm fine with it.)
Yes, and we can expect some distos to cling to the old libraries for a looooong time.
Quoted 2 lines
Similarly, is there something that can be done for
SO_PEERSECthat doesn't require using "display" for "modern" libraries?
Yes, and I made sure the implementation could accommodate that. It would be easy to add a "display" that would use the much discussed $lsm1="a",$lsm2="b" format. I didn't include it because without a liblsm to use it it's just clutter.
Quoted 222 lines
-Kees
Quoted 219 lines
Signed-off-by Casey Schaufler <[email protected]>--- fs/proc/base.c | 1 + security/security.c | 108 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 88 insertions(+), 21 deletions(-)fs/proc/base.c +1
-0@@ -2618,6 +2618,7 @@ static const struct pid_entry attr_dir_stuff[] = {ATTR (NULL ,"fscreate" ,0666 ),ATTR (NULL ,"keycreate" ,0666 ),ATTR (NULL ,"sockcreate" ,0666 ), +ATTR (NULL ,"display" ,0666 ), #ifdef CONFIG_SECURITY_SMACKDIR ("smack" ,0555 , proc_smack_attr_dir_inode_ops, proc_smack_attr_dir_ops),security/security.c +87
-21@@ -46,7 +46,9 @@ static struct kmem_cache *lsm_file_cache;static struct kmem_cache *lsm_inode_cache;char *lsm_names; -static struct lsm_blob_sizes blob_sizes __lsm_ro_after_init; +static struct lsm_blob_sizes blob_sizes __lsm_ro_after_init = { + .lbs_task =sizeof (int ), +};/* Boot-time LSM user choice */ static __initdata const char *chosen_lsm_order;@@ -578,6 +580,8 @@ int lsm_inode_alloc(struct inode *inode)*/ static int lsm_task_alloc (struct task_struct *task) { +int *display; +if (blob_sizes.lbs_task ==0 ) { task->security =NULL ;return 0 ;@@ -586,6 +590,10 @@ static int lsm_task_alloc(struct task_struct *task) task->security =kzalloc (blob_sizes.lbs_task,GFP_KERNEL );if (task->security ==NULL )return -ENOMEM ; + + display = task->security; + *display =LSMDATA_INVALID ; +return 0 ; }@@ -1574,14 +1582,27 @@ int security_file_open(struct file *file)int security_task_alloc (struct task_struct *task,unsigned long clone_flags) { +int *odisplay = current->security; +int *ndisplay;int rc =lsm_task_alloc (task); -if (rc) +if (unlikely (rc))return rc; + rc =call_int_hook (task_alloc,0 , task, clone_flags); -if (unlikely (rc)) +if (unlikely (rc)) {security_task_free (task); -return rc; +return rc; + } + + ndisplay = task->security; +if (ndisplay ==NULL ) +return 0 ; + +if (odisplay !=NULL ) + *ndisplay = *odisplay; + +return 0 ; }void security_task_free (struct task_struct *task)@@ -1967,10 +1988,28 @@ int security_getprocattr(struct task_struct *p, const char *lsm, char *name, char **value) {struct security_hook_list *hp; +int *display = current->security; + +if (!strcmp (name,"display" )) { +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, + list) { +if (*display ==LSMDATA_INVALID || + hp->slot == *display) { + *value =kstrdup (hp->lsm,GFP_KERNEL ); +if (*value) +return strlen (hp->lsm); +return -ENOMEM ; + } + } +return -EINVAL ; + }hlist_for_each_entry (hp, &security_hook_heads.getprocattr, list) {if (lsm !=NULL &&strcmp (lsm, hp->lsm))continue ; +if (lsm ==NULL && *display !=LSMDATA_INVALID && + *display != hp->slot) +continue ;return hp->hook.getprocattr (p, name, value); }return -EINVAL ;@@ -1980,10 +2019,27 @@ int security_setprocattr(const char *lsm, const char *name, void *value, size_t size) {struct security_hook_list *hp; +int *display = current->security; +int len; + +if (!strcmp (name,"display" )) { +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, + list) { + len =strlen (hp->lsm); +if (size >= len && !strncmp (value, hp->lsm, len)) { + *display = hp->slot; +return size; + } + } +return -EINVAL ; + }hlist_for_each_entry (hp, &security_hook_heads.setprocattr, list) {if (lsm !=NULL &&strcmp (lsm, hp->lsm))continue ; +if (lsm ==NULL && *display !=LSMDATA_INVALID && + *display != hp->slot) +continue ;return hp->hook.setprocattr (name, value, size); }return -EINVAL ;@@ -2002,38 +2058,41 @@ EXPORT_SYMBOL(security_ismaclabel);int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen) { +int *display = current->security;struct security_hook_list *hp; -int rc; -hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) { - rc = hp->hook.secid_to_secctx (l->secid[hp->slot], - secdata, seclen); -if (rc !=0 ) -return rc; - } +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) +return hp->hook.secid_to_secctx (l->secid[hp->slot], + secdata, seclen);return 0 ; }EXPORT_SYMBOL (security_secid_to_secctx);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *l) { +int *display = current->security;struct security_hook_list *hp; -int rc;lsmblob_init (l,0 ); -hlist_for_each_entry (hp, &security_hook_heads.secctx_to_secid, list) { - rc = hp->hook.secctx_to_secid (secdata, seclen, - &l->secid[hp->slot]); -if (rc !=0 ) -return rc; - } +hlist_for_each_entry (hp, &security_hook_heads.secctx_to_secid, list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) +return hp->hook.secctx_to_secid (secdata, seclen, + &l->secid[hp->slot]);return 0 ; }EXPORT_SYMBOL (security_secctx_to_secid);void security_release_secctx (char *secdata,u32 seclen) { -call_void_hook (release_secctx, secdata, seclen); +int *display = current->security; +struct security_hook_list *hp; + +hlist_for_each_entry (hp, &security_hook_heads.release_secctx, list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) { + hp->hook.release_secctx (secdata, seclen); +return ; + } }EXPORT_SYMBOL (security_release_secctx);@@ -2158,8 +2217,15 @@ EXPORT_SYMBOL(security_sock_rcv_skb);int security_socket_getpeersec_stream (struct socket *sock,char __user *optval,int __user *optlen,unsigned len) { -return call_int_hook (socket_getpeersec_stream, -ENOPROTOOPT , sock, - optval, optlen, len); +int *display = current->security; +struct security_hook_list *hp; + +hlist_for_each_entry (hp, &security_hook_heads.socket_getpeersec_stream, + list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) +return hp->hook.socket_getpeersec_stream (sock, optval, + optlen, len); +return -ENOPROTOOPT ; } int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb,Signature · 1 line
2.20.1
Re: [PATCH v2 15/25] LSM: Specify which LSM to display
In reply to Casey SchauflerQuoted 33 lines · Casey Schaufler
Create a new entry "display" in
/proc/.../attrfor controlling which LSM security information is displayed for a process. The name of an active LSM that supplies hooks for human readable data may be written to "display" to set the value. The name of the LSM currently in use can be read from "display". At this point there can only be one LSM capable of display active.This affects
/proc/.../attr/currentandSO_PEERSEC.Signed-off-by Casey Schaufler <[email protected]>--- fs/proc/base.c | 1 + security/security.c | 108 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 88 insertions(+), 21 deletions(-)fs/proc/base.c +1
-0@@ -2618,6 +2618,7 @@ static const struct pid_entry attr_dir_stuff[] = {ATTR (NULL ,"fscreate" ,0666 ),ATTR (NULL ,"keycreate" ,0666 ),ATTR (NULL ,"sockcreate" ,0666 ), +ATTR (NULL ,"display" ,0666 ), #ifdef CONFIG_SECURITY_SMACKDIR ("smack" ,0555 , proc_smack_attr_dir_inode_ops, proc_smack_attr_dir_ops),security/security.c +0
-0
security/security.c static struct kmem_cache *lsm_file_cache; · line 51
Quoted 7 lines
security/security.c +3
-1@@ -46,7 +46,9 @@ static struct kmem_cache *lsm_file_cache;static struct kmem_cache *lsm_inode_cache;char *lsm_names; -static struct lsm_blob_sizes blob_sizes __lsm_ro_after_init; +static struct lsm_blob_sizes blob_sizes __lsm_ro_after_init = { + .lbs_task =sizeof (int ), +};
This needs some comments. I know what's happening here only because I understand very well how the blob sizing works. :) Perhaps:
.lbs_task = sizeof(int), /* storage for selected "display" LSM */
Quoted 13 lines
security/security.c +2
-0/* Boot-time LSM user choice */ static __initdata const char *chosen_lsm_order;@@ -578,6 +580,8 @@ int lsm_inode_alloc(struct inode *inode)*/ static int lsm_task_alloc (struct task_struct *task) { +int *display; +if (blob_sizes.lbs_task ==0 ) { task->security =NULL ;return 0 ;
security/security.c static int lsm_task_alloc(struct task_struct *task) · line 595
Quoted 6 lines
security/security.c +3
-0@@ -586,6 +590,10 @@ static int lsm_task_alloc(struct task_struct *task) task->security =kzalloc (blob_sizes.lbs_task,GFP_KERNEL );if (task->security ==NULL )return -ENOMEM ; + + display = task->security; + *display =LSMDATA_INVALID ;
Similarly I think a comment here would be nice. "Initialize currently selected "display" LSM to unselected" or something.
Also: "int" is okay here for now, but if the LSM infrastructure wants to do more like this we'll want to convert to a struct of some kind at the start of the lbs_task.
Quoted 19 lines
security/security.c +6
-2+return 0 ; }@@ -1574,14 +1582,27 @@ int security_file_open(struct file *file)int security_task_alloc (struct task_struct *task,unsigned long clone_flags) { +int *odisplay = current->security; +int *ndisplay;int rc =lsm_task_alloc (task); -if (rc) +if (unlikely (rc))return rc; + rc =call_int_hook (task_alloc,0 , task, clone_flags); -if (unlikely (rc)) +if (unlikely (rc)) {
security/security.c int security_file_open(struct file *file) · line 1602
Quoted 10 lines
security/security.c +8
-1security_task_free (task); -return rc; +return rc; + } + + ndisplay = task->security; +if (ndisplay ==NULL ) +return 0 ; + +if (odisplay !=NULL )
Perhaps merge these into "if (ndisplay && odisplay)" to drop the early return 0 check?
Quoted 141 lines
security/security.c +65
-17+ *ndisplay = *odisplay; + +return 0 ; }void security_task_free (struct task_struct *task)@@ -1967,10 +1988,28 @@ int security_getprocattr(struct task_struct *p, const char *lsm, char *name, char **value) {struct security_hook_list *hp; +int *display = current->security; + +if (!strcmp (name,"display" )) { +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, + list) { +if (*display ==LSMDATA_INVALID || + hp->slot == *display) { + *value =kstrdup (hp->lsm,GFP_KERNEL ); +if (*value) +return strlen (hp->lsm); +return -ENOMEM ; + } + } +return -EINVAL ; + }hlist_for_each_entry (hp, &security_hook_heads.getprocattr, list) {if (lsm !=NULL &&strcmp (lsm, hp->lsm))continue ; +if (lsm ==NULL && *display !=LSMDATA_INVALID && + *display != hp->slot) +continue ;return hp->hook.getprocattr (p, name, value); }return -EINVAL ;@@ -1980,10 +2019,27 @@ int security_setprocattr(const char *lsm, const char *name, void *value, size_t size) {struct security_hook_list *hp; +int *display = current->security; +int len; + +if (!strcmp (name,"display" )) { +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, + list) { + len =strlen (hp->lsm); +if (size >= len && !strncmp (value, hp->lsm, len)) { + *display = hp->slot; +return size; + } + } +return -EINVAL ; + }hlist_for_each_entry (hp, &security_hook_heads.setprocattr, list) {if (lsm !=NULL &&strcmp (lsm, hp->lsm))continue ; +if (lsm ==NULL && *display !=LSMDATA_INVALID && + *display != hp->slot) +continue ;return hp->hook.setprocattr (name, value, size); }return -EINVAL ;@@ -2002,38 +2058,41 @@ EXPORT_SYMBOL(security_ismaclabel);int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen) { +int *display = current->security;struct security_hook_list *hp; -int rc; -hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) { - rc = hp->hook.secid_to_secctx (l->secid[hp->slot], - secdata, seclen); -if (rc !=0 ) -return rc; - } +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) +return hp->hook.secid_to_secctx (l->secid[hp->slot], + secdata, seclen);return 0 ; }EXPORT_SYMBOL (security_secid_to_secctx);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *l) { +int *display = current->security;struct security_hook_list *hp; -int rc;lsmblob_init (l,0 ); -hlist_for_each_entry (hp, &security_hook_heads.secctx_to_secid, list) { - rc = hp->hook.secctx_to_secid (secdata, seclen, - &l->secid[hp->slot]); -if (rc !=0 ) -return rc; - } +hlist_for_each_entry (hp, &security_hook_heads.secctx_to_secid, list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) +return hp->hook.secctx_to_secid (secdata, seclen, + &l->secid[hp->slot]);return 0 ; }EXPORT_SYMBOL (security_secctx_to_secid);void security_release_secctx (char *secdata,u32 seclen) { -call_void_hook (release_secctx, secdata, seclen); +int *display = current->security; +struct security_hook_list *hp; + +hlist_for_each_entry (hp, &security_hook_heads.release_secctx, list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) { + hp->hook.release_secctx (secdata, seclen); +return ; + } }EXPORT_SYMBOL (security_release_secctx);@@ -2158,8 +2217,15 @@ EXPORT_SYMBOL(security_sock_rcv_skb);int security_socket_getpeersec_stream (struct socket *sock,char __user *optval,int __user *optlen,unsigned len) { -return call_int_hook (socket_getpeersec_stream, -ENOPROTOOPT , sock, - optval, optlen, len); +int *display = current->security; +struct security_hook_list *hp; + +hlist_for_each_entry (hp, &security_hook_heads.socket_getpeersec_stream, + list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) +return hp->hook.socket_getpeersec_stream (sock, optval, + optlen, len); +return -ENOPROTOOPT ; } int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb,Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerRe: [PATCH v2 15/25] LSM: Specify which LSM to display
Quoted 44 lines · Kees Cook
Quoted 33 lines · Casey Schaufler
Create a new entry "display" in
/proc/.../attrfor controlling which LSM security information is displayed for a process. The name of an active LSM that supplies hooks for human readable data may be written to "display" to set the value. The name of the LSM currently in use can be read from "display". At this point there can only be one LSM capable of display active.This affects
/proc/.../attr/currentandSO_PEERSEC.Signed-off-by Casey Schaufler <[email protected]>--- fs/proc/base.c | 1 + security/security.c | 108 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 88 insertions(+), 21 deletions(-)fs/proc/base.c +1
-0@@ -2618,6 +2618,7 @@ static const struct pid_entry attr_dir_stuff[] = {ATTR (NULL ,"fscreate" ,0666 ),ATTR (NULL ,"keycreate" ,0666 ),ATTR (NULL ,"sockcreate" ,0666 ), +ATTR (NULL ,"display" ,0666 ), #ifdef CONFIG_SECURITY_SMACKDIR ("smack" ,0555 , proc_smack_attr_dir_inode_ops, proc_smack_attr_dir_ops),security/security.c +0
-0security/security.c static struct kmem_cache *lsm_file_cache; · line 51
Quoted 7 lines
security/security.c +3
-1@@ -46,7 +46,9 @@ static struct kmem_cache *lsm_file_cache;static struct kmem_cache *lsm_inode_cache;char *lsm_names; -static struct lsm_blob_sizes blob_sizes __lsm_ro_after_init; +static struct lsm_blob_sizes blob_sizes __lsm_ro_after_init = { + .lbs_task =sizeof (int ), +};This needs some comments. I know what's happening here only because I understand very well how the blob sizing works. :) Perhaps:
Quoted 1 line
.lbs_task = sizeof(int), /* storage for selected "display" LSM */
Point.
Quoted 13 lines
Quoted 13 lines
security/security.c +2
-0/* Boot-time LSM user choice */ static __initdata const char *chosen_lsm_order;@@ -578,6 +580,8 @@ int lsm_inode_alloc(struct inode *inode)*/ static int lsm_task_alloc (struct task_struct *task) { +int *display; +if (blob_sizes.lbs_task ==0 ) { task->security =NULL ;return 0 ;@@ -586,6 +590,10 @@ static int lsm_task_alloc(struct task_struct *task)
Quoted 8 lines
security/security.c static int lsm_task_alloc(struct task_struct *task) · line 595
Quoted 6 lines
security/security.c +3
-0task->security =kzalloc (blob_sizes.lbs_task,GFP_KERNEL );if (task->security ==NULL )return -ENOMEM ; + + display = task->security; + *display =LSMDATA_INVALID ;Similarly I think a comment here would be nice. "Initialize currently selected "display" LSM to unselected" or something.
Point.
Quoted 3 lines
Also: "int" is okay here for now, but if the LSM infrastructure wants to do more like this we'll want to convert to a struct of some kind at the start of the
lbs_task.
We could go whole hog and include a lsm_info pointer (once the slot number moves there) instead of an int, but I think it best to leave it as is for now. I don't see a case where more information would be required, and it would not be a hard change to make later.
Quoted 23 lines
Quoted 23 lines
security/security.c +8
-3+return 0 ; }@@ -1574,14 +1582,27 @@ int security_file_open(struct file *file)int security_task_alloc (struct task_struct *task,unsigned long clone_flags) { +int *odisplay = current->security; +int *ndisplay;int rc =lsm_task_alloc (task); -if (rc) +if (unlikely (rc))return rc; + rc =call_int_hook (task_alloc,0 , task, clone_flags); -if (unlikely (rc)) +if (unlikely (rc)) {security_task_free (task); -return rc; +return rc; + }
Quoted 8 lines
security/security.c int security_file_open(struct file *file) · line 1602
Quoted 6 lines
security/security.c +6
-0+ + ndisplay = task->security; +if (ndisplay ==NULL ) +return 0 ; + +if (odisplay !=NULL )Perhaps merge these into "if (ndisplay && odisplay)" to drop the early return 0 check?
Sure. The logic took a few iterations before it got to what you see here.
Quoted 141 lines
Quoted 141 lines
security/security.c +65
-17+ *ndisplay = *odisplay; + +return 0 ; }void security_task_free (struct task_struct *task)@@ -1967,10 +1988,28 @@ int security_getprocattr(struct task_struct *p, const char *lsm, char *name, char **value) {struct security_hook_list *hp; +int *display = current->security; + +if (!strcmp (name,"display" )) { +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, + list) { +if (*display ==LSMDATA_INVALID || + hp->slot == *display) { + *value =kstrdup (hp->lsm,GFP_KERNEL ); +if (*value) +return strlen (hp->lsm); +return -ENOMEM ; + } + } +return -EINVAL ; + }hlist_for_each_entry (hp, &security_hook_heads.getprocattr, list) {if (lsm !=NULL &&strcmp (lsm, hp->lsm))continue ; +if (lsm ==NULL && *display !=LSMDATA_INVALID && + *display != hp->slot) +continue ;return hp->hook.getprocattr (p, name, value); }return -EINVAL ;@@ -1980,10 +2019,27 @@ int security_setprocattr(const char *lsm, const char *name, void *value, size_t size) {struct security_hook_list *hp; +int *display = current->security; +int len; + +if (!strcmp (name,"display" )) { +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, + list) { + len =strlen (hp->lsm); +if (size >= len && !strncmp (value, hp->lsm, len)) { + *display = hp->slot; +return size; + } + } +return -EINVAL ; + }hlist_for_each_entry (hp, &security_hook_heads.setprocattr, list) {if (lsm !=NULL &&strcmp (lsm, hp->lsm))continue ; +if (lsm ==NULL && *display !=LSMDATA_INVALID && + *display != hp->slot) +continue ;return hp->hook.setprocattr (name, value, size); }return -EINVAL ;@@ -2002,38 +2058,41 @@ EXPORT_SYMBOL(security_ismaclabel);int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen) { +int *display = current->security;struct security_hook_list *hp; -int rc; -hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) { - rc = hp->hook.secid_to_secctx (l->secid[hp->slot], - secdata, seclen); -if (rc !=0 ) -return rc; - } +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) +return hp->hook.secid_to_secctx (l->secid[hp->slot], + secdata, seclen);return 0 ; }EXPORT_SYMBOL (security_secid_to_secctx);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *l) { +int *display = current->security;struct security_hook_list *hp; -int rc;lsmblob_init (l,0 ); -hlist_for_each_entry (hp, &security_hook_heads.secctx_to_secid, list) { - rc = hp->hook.secctx_to_secid (secdata, seclen, - &l->secid[hp->slot]); -if (rc !=0 ) -return rc; - } +hlist_for_each_entry (hp, &security_hook_heads.secctx_to_secid, list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) +return hp->hook.secctx_to_secid (secdata, seclen, + &l->secid[hp->slot]);return 0 ; }EXPORT_SYMBOL (security_secctx_to_secid);void security_release_secctx (char *secdata,u32 seclen) { -call_void_hook (release_secctx, secdata, seclen); +int *display = current->security; +struct security_hook_list *hp; + +hlist_for_each_entry (hp, &security_hook_heads.release_secctx, list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) { + hp->hook.release_secctx (secdata, seclen); +return ; + } }EXPORT_SYMBOL (security_release_secctx);@@ -2158,8 +2217,15 @@ EXPORT_SYMBOL(security_sock_rcv_skb);int security_socket_getpeersec_stream (struct socket *sock,char __user *optval,int __user *optlen,unsigned len) { -return call_int_hook (socket_getpeersec_stream, -ENOPROTOOPT , sock, - optval, optlen, len); +int *display = current->security; +struct security_hook_list *hp; + +hlist_for_each_entry (hp, &security_hook_heads.socket_getpeersec_stream, + list) +if (*display ==LSMDATA_INVALID || *display == hp->slot) +return hp->hook.socket_getpeersec_stream (sock, optval, + optlen, len); +return -ENOPROTOOPT ; } int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb,Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 16/25 LSM: Ensure the correct LSM context releaser
In reply to Casey SchauflerAdd a new lsmcontext data structure to hold all the information about a "security context", including the string, its size and which LSM allocated the string. The allocation information is necessary because LSMs have different policies regarding the lifecycle of these strings. SELinux allocates and destroys them on each use, whereas Smack provides a pointer to an entry in a list that never goes away.
Change the security_release_secctx() interface to use the lsmcontext and call only the appropiate LSM hook. Change the callers of security_release_secctx() to provide the correct type of data, introducing scaffolding where required.
--- drivers/android/binder.c | 10 +++++-- fs/kernfs/dir.c | 9 ++++-- fs/kernfs/inode.c | 7 +++-- fs/nfs/nfs4proc.c | 8 ++++-- fs/nfsd/nfs4xdr.c | 7 +++-- include/linux/security.h | 37 +++++++++++++++++++++++-- include/net/scm.h | 4 ++- kernel/audit.c | 14 +++++++--- kernel/auditsc.c | 12 ++++++-- net/ipv4/ip_sockglue.c | 4 ++- net/netfilter/nf_conntrack_netlink.c | 4 ++- net/netfilter/nf_conntrack_standalone.c | 4 ++- net/netfilter/nfnetlink_queue.c | 13 ++++++--- net/netlabel/netlabel_unlabeled.c | 19 ++++++++++--- net/netlabel/netlabel_user.c | 4 ++- security/security.c | 12 +++++--- security/smack/smack_lsm.c | 14 +++++++--- 17 files changed, 140 insertions(+), 42 deletions(-)
drivers/android/binder.c +7 -3
@@ -2876,6 +2876,7 @@ static void binder_transaction(struct binder_proc *proc,int t_debug_id =atomic_inc_return (&binder_last_id);char *secctx =NULL ;u32 secctx_sz =0 ; +struct lsmcontext scaff;/* scaffolding */ e =binder_transaction_log_add (&binder_transaction_log); e->debug_id = t_debug_id;
@@ -3158,7 +3159,8 @@ static void binder_transaction(struct binder_proc *proc,binder_alloc_copy_to_buffer (&target_proc->alloc, t->buffer, buf_offset, secctx, secctx_sz); -security_release_secctx (secctx, secctx_sz); +lsmcontext_init (&scaff, secctx, secctx_sz,0 ); +security_release_secctx (&scaff); secctx =NULL ; } t->buffer->debug_id = t->debug_id;
@@ -3479,8 +3481,10 @@ static void binder_transaction(struct binder_proc *proc, t->buffer->transaction =NULL ;binder_alloc_free_buf (&target_proc->alloc, t->buffer); err_binder_alloc_buf_failed: -if (secctx) -security_release_secctx (secctx, secctx_sz); +if (secctx) { +lsmcontext_init (&scaff, secctx, secctx_sz,0 ); +security_release_secctx (&scaff); + } err_get_secctx_failed:kfree (tcomplete);binder_stats_deleted (BINDER_STAT_TRANSACTION_COMPLETE );
fs/kernfs/dir.c +6 -3
@@ -532,9 +532,12 @@ void kernfs_put(struct kernfs_node *kn)kfree_const (kn->name);if (kn->iattr) { -if (kn->iattr->ia_secdata) -security_release_secctx (kn->iattr->ia_secdata, - kn->iattr->ia_secdata_len); +struct lsmcontext scaff;/* scaffolding */ +if (kn->iattr->ia_secdata) { +lsmcontext_init (&scaff, kn->iattr->ia_secdata, + kn->iattr->ia_secdata_len,0 ); +security_release_secctx (&scaff); + }simple_xattrs_free (&kn->iattr->xattrs);kmem_cache_free (kernfs_iattrs_cache, kn->iattr); }
fs/kernfs/inode.c +5 -2
@@ -349,6 +349,7 @@ static int kernfs_security_xattr_set(const struct xattr_handler *handler, {struct kernfs_node *kn = inode->i_private;struct kernfs_iattrs *attrs; +struct lsmcontext context;void *secdata;u32 secdata_len =0 ;int error;
@@ -368,8 +369,10 @@ static int kernfs_security_xattr_set(const struct xattr_handler *handler, error =kernfs_node_setsecdata (attrs, &secdata, &secdata_len);mutex_unlock (&kernfs_mutex); -if (secdata) -security_release_secctx (secdata, secdata_len); +if (secdata) { +lsmcontext_init (&context, secdata, secdata_len,0 ); +security_release_secctx (&context); + }return error; }
fs/nfs/nfs4proc.c +6 -2
@@ -131,8 +131,12 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,static inline void nfs4_label_release_security (struct nfs4_label *label) { -if (label) -security_release_secctx (label->label, label->len); +struct lsmcontext scaff;/* scaffolding */ + +if (label) { +lsmcontext_init (&scaff, label->label, label->len,0 ); +security_release_secctx (&scaff); + } }static inline u32 *nfs4_bitmask (struct nfs_server *server,struct nfs4_label *label) {
fs/nfsd/nfs4xdr.c +5 -2
@@ -2420,6 +2420,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,__be32 status;int err;struct nfs4_acl *acl =NULL ; +struct lsmcontext scaff;/* scaffolding */ void *context =NULL ;int contextlen;bool contextsupport = false;
@@ -2919,8 +2920,10 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, out:#ifdef CONFIG_NFSD_V4_SECURITY_LABEL -if (context) -security_release_secctx (context, contextlen); +if (context) { +lsmcontext_init (&scaff, context, contextlen,0 );/*scaffolding*/ +security_release_secctx (&scaff); + }#endif /* CONFIG_NFSD_V4_SECURITY_LABEL */ kfree (acl);if (tempfh) {
include/linux/security.h +35 -2
@@ -76,6 +76,39 @@ enum lsm_event { LSM_POLICY_CHANGE, }; +/* +* A "security context" is the text representation of +* the information used by LSMs. +* This structure contains the string, its length, and which LSM +* it is useful for. +*/ +struct lsmcontext { +char *context;/* Provided by the module */ +u32 len; +int slot;/* Identifies the module */ +}; + +/** +* lsmcontext_init - initialize an lsmcontext structure. +* @cp: Pointer to the context to initialize +* @context: Initial context, or NULL +* @size: Size of context, or 0 +* @slot: Which LSM provided the context +* +* Fill in the lsmcontext from the provided information. +*/ +static inline void lsmcontext_init (struct lsmcontext *cp,char *context, +u32 size,int slot) +{ + cp->slot = slot; + cp->context = context; + +if (context ==NULL || size ==0 ) + cp->len =0 ; +else + cp->len =strlen (context); +} +/* * Data exported by the security modules */
@@ -445,7 +478,7 @@ int security_ismaclabel(const char *name);int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *l); -void security_release_secctx (char *secdata,u32 seclen); +void security_release_secctx (struct lsmcontext *cp);void security_inode_invalidate_secctx (struct inode *inode);int security_inode_notifysecctx (struct inode *inode,void *ctx,u32 ctxlen);
@@ -1236,7 +1269,7 @@ static inline int security_secctx_to_secid(const char *secdata,return -EOPNOTSUPP ; } -static inline void security_release_secctx (char *secdata,u32 seclen) +static inline void security_release_secctx (struct lsmcontext *cp) { }
include/net/scm.h +3 -1
@@ -92,6 +92,7 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,#ifdef CONFIG_SECURITY_NETWORK static inline void scm_passec (struct socket *sock,struct msghdr *msg,struct scm_cookie *scm) { +struct lsmcontext context;char *secdata;u32 seclen;int err;
@@ -101,7 +102,8 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scif (!err) {put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , seclen, secdata); -security_release_secctx (secdata, seclen); +lsmcontext_init (&context, secdata, seclen,0 );/*scaffolding*/ +security_release_secctx (&context); } } }
kernel/audit.c +10 -4
@@ -1193,6 +1193,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)struct audit_sig_info *sig_data;char *ctx =NULL ;u32 len; +struct lsmcontext scaff;/* scaffolding */ err =audit_netlink_ok (skb, msg_type);if (err)
@@ -1437,15 +1438,18 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) } sig_data =kmalloc (sizeof (*sig_data) + len,GFP_KERNEL );if (!sig_data) { -if (lsmblob_is_set (&audit_sig_lsm)) -security_release_secctx (ctx, len); +if (lsmblob_is_set (&audit_sig_lsm)) { +lsmcontext_init (&scaff, ctx, len,0 ); +security_release_secctx (&scaff); + }return -ENOMEM ; } sig_data->uid =from_kuid (&init_user_ns, audit_sig_uid); sig_data->pid = audit_sig_pid;if (lsmblob_is_set (&audit_sig_lsm)) {memcpy (sig_data->ctx, ctx, len); -security_release_secctx (ctx, len); +lsmcontext_init (&scaff, ctx, len,0 ); +security_release_secctx (&scaff); }audit_send_reply (skb, seq,AUDIT_SIGNAL_INFO ,0 ,0 , sig_data,sizeof (*sig_data) + len);
@@ -2074,6 +2078,7 @@ int audit_log_task_context(struct audit_buffer *ab)unsigned len;int error;struct lsmblob le; +struct lsmcontext scaff;/* scaffolding */ security_task_getsecid (current, &le);if (!lsmblob_is_set (&le))
@@ -2087,7 +2092,8 @@ int audit_log_task_context(struct audit_buffer *ab) }audit_log_format (ab," subj=%s" , ctx); -security_release_secctx (ctx, len); +lsmcontext_init (&scaff, ctx, len,0 ); +security_release_secctx (&scaff);return 0 ; error_path:
kernel/auditsc.c +9 -3
@@ -942,6 +942,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, struct lsmblob *l, char *comm) { struct audit_buffer *ab; +struct lsmcontext lsmcxt;char *ctx =NULL ;u32 len;int rc =0 ;
@@ -959,7 +960,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, rc =1 ; }else {audit_log_format (ab," obj=%s" , ctx); -security_release_secctx (ctx, len); +lsmcontext_init (&lsmcxt, ctx, len,0 );/*scaffolding*/ +security_release_secctx (&lsmcxt); } }audit_log_format (ab," ocomm=" );
@@ -1171,6 +1173,7 @@ static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name)static void show_special (struct audit_context *context,int *call_panic) { +struct lsmcontext lsmcxt;struct audit_buffer *ab;int i;
@@ -1203,7 +1206,8 @@ static void show_special(struct audit_context *context, int *call_panic) *call_panic =1 ; }else {audit_log_format (ab," obj=%s" , ctx); -security_release_secctx (ctx, len); +lsmcontext_init (&lsmcxt, ctx, len,0 ); +security_release_secctx (&lsmcxt); } }if (context->ipc.has_perm) {
@@ -1350,6 +1354,7 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,char *ctx =NULL ;u32 len;struct lsmblob le; +struct lsmcontext lsmcxt;lsmblob_init (&le, n->osid);if (security_secid_to_secctx (&le, &ctx, &len)) {
@@ -1358,7 +1363,8 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n, *call_panic =2 ; }else {audit_log_format (ab," obj=%s" , ctx); -security_release_secctx (ctx, len); +lsmcontext_init (&lsmcxt, ctx, len,0 );/* scaffolding */ +security_release_secctx (&lsmcxt); } }
net/ipv4/ip_sockglue.c +3 -1
@@ -130,6 +130,7 @@ static void ip_cmsg_recv_checksum(struct msghdr *msg, struct sk_buff *skb,static void ip_cmsg_recv_security (struct msghdr *msg,struct sk_buff *skb) { +struct lsmcontext context;struct lsmblob lb;char *secdata;u32 seclen;
@@ -144,7 +145,8 @@ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb)return ;put_cmsg (msg,SOL_IP ,SCM_SECURITY , seclen, secdata); -security_release_secctx (secdata, seclen); +lsmcontext_init (&context, secdata, seclen,0 );/* scaffolding */ +security_release_secctx (&context); }static void ip_cmsg_recv_dstaddr (struct msghdr *msg,struct sk_buff *skb)
net/netfilter/nf_conntrack_netlink.c +3 -1
@@ -331,6 +331,7 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)int len, ret;char *secctx;struct lsmblob le; +struct lsmcontext context;lsmblob_init (&le, ct->secmark); ret =security_secid_to_secctx (&le, &secctx, &len);
@@ -348,7 +349,8 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct) ret =0 ; nla_put_failure: -security_release_secctx (secctx, len); +lsmcontext_init (&context, secctx, len,0 );/* scaffolding */ +security_release_secctx (&context); return ret; }#else
net/netfilter/nf_conntrack_standalone.c +3 -1
@@ -176,6 +176,7 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)u32 len;char *secctx;struct lsmblob le; +struct lsmcontext context;lsmblob_init (&le, ct->secmark); ret =security_secid_to_secctx (&le, &secctx, &len);
@@ -184,7 +185,8 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)seq_printf (s,"secctx=%s " , secctx); - security_release_secctx(secctx, len); +lsmcontext_init (&context, secctx, len,0 );/* scaffolding */ + security_release_secctx(&context); }#else static inline void ct_show_secctx (struct seq_file *s,const struct nf_conn *ct)
net/netfilter/nfnetlink_queue.c +9 -4
@@ -399,6 +399,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,enum ip_conntrack_info uninitialized_var (ctinfo );struct nfnl_ct_hook *nfnl_ct;bool csum_verify; +struct lsmcontext scaff;/* scaffolding */ char *secdata =NULL ;u32 seclen =0 ;
@@ -629,8 +630,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, } nlh->nlmsg_len = skb->len; -if (seclen) -security_release_secctx (secdata, seclen); +if (seclen) { +lsmcontext_init (&scaff, secdata, seclen,0 ); +security_release_secctx (&scaff); + }return skb; nla_put_failure:
@@ -638,8 +641,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,kfree_skb (skb);net_err_ratelimited ("nf_queue: error creating packet message\n" ); nlmsg_failure: -if (seclen) -security_release_secctx (secdata, seclen); +if (seclen) { +lsmcontext_init (&scaff, secdata, seclen,0 ); +security_release_secctx (&scaff); + }return NULL ; }
net/netlabel/netlabel_unlabeled.c +15 -4
@@ -387,6 +387,7 @@ int netlbl_unlhsh_add(struct net *net,struct net_device *dev;struct netlbl_unlhsh_iface *iface;struct audit_buffer *audit_buf =NULL ; +struct lsmcontext context;char *secctx =NULL ;u32 secctx_len;struct lsmblob le;
@@ -457,7 +458,9 @@ int netlbl_unlhsh_add(struct net *net, &secctx, &secctx_len) == 0) {audit_log_format (audit_buf," sec_obj=%s" , secctx); -security_release_secctx (secctx, secctx_len); +/* scaffolding */ +lsmcontext_init (&context, secctx, secctx_len,0 ); +security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , ret_val ==0 ?1 :0 );audit_log_end (audit_buf);
@@ -488,6 +491,7 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,struct netlbl_unlhsh_addr4 *entry;struct audit_buffer *audit_buf;struct net_device *dev; +struct lsmcontext context;char *secctx;u32 secctx_len;struct lsmblob le;
@@ -516,7 +520,9 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, security_secid_to_secctx(&le, &secctx, &secctx_len) == 0) {audit_log_format (audit_buf," sec_obj=%s" , secctx); -security_release_secctx (secctx, secctx_len); +/* scaffolding */ +lsmcontext_init (&context, secctx, secctx_len,0 ); +security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , entry !=NULL ?1 :0 );audit_log_end (audit_buf);
@@ -553,6 +559,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,struct netlbl_unlhsh_addr6 *entry;struct audit_buffer *audit_buf;struct net_device *dev; +struct lsmcontext context;char *secctx;u32 secctx_len;struct lsmblob le;
@@ -580,7 +587,8 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, security_secid_to_secctx(&le, &secctx, &secctx_len) == 0) {audit_log_format (audit_buf," sec_obj=%s" , secctx); -security_release_secctx (secctx, secctx_len); +lsmcontext_init (&context, secctx, secctx_len,0 ); +security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , entry !=NULL ?1 :0 );audit_log_end (audit_buf);
@@ -1094,6 +1102,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,int ret_val = -ENOMEM ;struct netlbl_unlhsh_walk_arg *cb_arg = arg;struct net_device *dev; +struct lsmcontext context;void *data;u32 secid;char *secctx;
@@ -1161,7 +1170,9 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,NLBL_UNLABEL_A_SECCTX , secctx_len, secctx); -security_release_secctx (secctx, secctx_len); +/* scaffolding */ +lsmcontext_init (&context, secctx, secctx_len,0 ); +security_release_secctx (&context);if (ret_val !=0 ) goto list_cb_failure;
net/netlabel/netlabel_user.c +3 -1
@@ -98,6 +98,7 @@ struct audit_buffer *netlbl_audit_start_common(int type, struct netlbl_audit *audit_info) {struct audit_buffer *audit_buf; +struct lsmcontext context;char *secctx;u32 secctx_len;struct lsmblob le;
@@ -117,7 +118,8 @@ struct audit_buffer *netlbl_audit_start_common(int type,if (audit_info->secid !=0 &&security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," subj=%s" , secctx); -security_release_secctx (secctx, secctx_len); +lsmcontext_init (&context, secctx, secctx_len,0 );/*scaffolding*/ +security_release_secctx (&context); }return audit_buf;
security/security.c +8 -4
@@ -458,6 +458,7 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count, &security_hook_heads.socket_getpeersec_dgram || hooks[i].head == &security_hook_heads.secctx_to_secid || hooks[i].head == &security_hook_heads.secid_to_secctx || + hooks[i].head == &security_hook_heads.release_secctx || hooks[i].head == &security_hook_heads.ipc_getsecid || hooks[i].head == &security_hook_heads.task_getsecid || hooks[i].head == &security_hook_heads.inode_getsecid ||
@@ -2083,16 +2084,19 @@ int security_secctx_to_secid(const char *secdata, u32 seclen, struct lsmblob *l) }EXPORT_SYMBOL (security_secctx_to_secid); -void security_release_secctx (char *secdata,u32 seclen) +void security_release_secctx (struct lsmcontext *cp) { -int *display = current->security;struct security_hook_list *hp;hlist_for_each_entry (hp, &security_hook_heads.release_secctx, list) -if (*display ==LSMDATA_INVALID || *display == hp->slot) { - hp->hook.release_secctx (secdata, seclen); +if (cp->slot == hp->slot) { + hp->hook.release_secctx (cp->context, cp->len); +lsmcontext_init (cp,NULL ,0 ,0 );return ; } + +pr_warn ("%s context \"%s\" from slot %d not released\n" , __func__, + cp->context, cp->slot); }EXPORT_SYMBOL (security_release_secctx);
security/smack/smack_lsm.c +10 -4
@@ -4439,11 +4439,16 @@ static int smack_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid)return 0 ; } -/* -* There used to be a smack_release_secctx hook -* that did nothing back when hooks were in a vector. -* Now that there's a list such a hook adds cost. +/** +* smack_release_secctx - do everything necessary to free a context +* @secdata: Unused +* @seclen: Unused +* +* Do nothing but hold a slot in the hooks list. */ +static void smack_release_secctx (char *secdata,u32 seclen) +{ +}static int smack_inode_notifysecctx (struct inode *inode,void *ctx,u32 ctxlen) {
@@ -4683,6 +4688,7 @@ static struct security_hook_list smack_hooks[] __lsm_ro_after_init = {LSM_HOOK_INIT (ismaclabel, smack_ismaclabel),LSM_HOOK_INIT (secid_to_secctx, smack_secid_to_secctx),LSM_HOOK_INIT (secctx_to_secid, smack_secctx_to_secid), +LSM_HOOK_INIT (release_secctx, smack_release_secctx),LSM_HOOK_INIT (inode_notifysecctx, smack_inode_notifysecctx),LSM_HOOK_INIT (inode_setsecctx, smack_inode_setsecctx), LSM_HOOK_INIT(inode_getsecctx, smack_inode_getsecctx),
Signature · 1 line
2.20.1
Re: [PATCH v2 16/25] LSM: Ensure the correct LSM context releaser
Quoted 188 lines · Casey Schaufler
Add a new lsmcontext data structure to hold all the information about a "security context", including the string, its size and which LSM allocated the string. The allocation information is necessary because LSMs have different policies regarding the lifecycle of these strings. SELinux allocates and destroys them on each use, whereas Smack provides a pointer to an entry in a list that never goes away.
Change the
security_release_secctx()interface to use the lsmcontext and call only the appropiate LSM hook. Change the callers ofsecurity_release_secctx()to provide the correct type of data, introducing scaffolding where required.Signed-off-by Casey Schaufler <[email protected]>--- drivers/android/binder.c | 10 +++++-- fs/kernfs/dir.c | 9 ++++-- fs/kernfs/inode.c | 7 +++-- fs/nfs/nfs4proc.c | 8 ++++-- fs/nfsd/nfs4xdr.c | 7 +++-- include/linux/security.h | 37 +++++++++++++++++++++++-- include/net/scm.h | 4 ++- kernel/audit.c | 14 +++++++--- kernel/auditsc.c | 12 ++++++-- net/ipv4/ip_sockglue.c | 4 ++- net/netfilter/nf_conntrack_netlink.c | 4 ++- net/netfilter/nf_conntrack_standalone.c | 4 ++- net/netfilter/nfnetlink_queue.c | 13 ++++++--- net/netlabel/netlabel_unlabeled.c | 19 ++++++++++--- net/netlabel/netlabel_user.c | 4 ++- security/security.c | 12 +++++--- security/smack/smack_lsm.c | 14 +++++++--- 17 files changed, 140 insertions(+), 42 deletions(-)drivers/android/binder.c +7
-3@@ -2876,6 +2876,7 @@ static void binder_transaction(struct binder_proc *proc,int t_debug_id =atomic_inc_return (&binder_last_id);char *secctx =NULL ;u32 secctx_sz =0 ; +struct lsmcontext scaff;/* scaffolding */ e =binder_transaction_log_add (&binder_transaction_log); e->debug_id = t_debug_id;@@ -3158,7 +3159,8 @@ static void binder_transaction(struct binder_proc *proc,binder_alloc_copy_to_buffer (&target_proc->alloc, t->buffer, buf_offset, secctx, secctx_sz); -security_release_secctx (secctx, secctx_sz); +lsmcontext_init (&scaff, secctx, secctx_sz,0 ); +security_release_secctx (&scaff); secctx =NULL ; } t->buffer->debug_id = t->debug_id;@@ -3479,8 +3481,10 @@ static void binder_transaction(struct binder_proc *proc, t->buffer->transaction =NULL ;binder_alloc_free_buf (&target_proc->alloc, t->buffer); err_binder_alloc_buf_failed: -if (secctx) -security_release_secctx (secctx, secctx_sz); +if (secctx) { +lsmcontext_init (&scaff, secctx, secctx_sz,0 ); +security_release_secctx (&scaff); + } err_get_secctx_failed:kfree (tcomplete);binder_stats_deleted (BINDER_STAT_TRANSACTION_COMPLETE );fs/kernfs/dir.c +6
-3@@ -532,9 +532,12 @@ void kernfs_put(struct kernfs_node *kn)kfree_const (kn->name);if (kn->iattr) { -if (kn->iattr->ia_secdata) -security_release_secctx (kn->iattr->ia_secdata, - kn->iattr->ia_secdata_len); +struct lsmcontext scaff;/* scaffolding */ +if (kn->iattr->ia_secdata) { +lsmcontext_init (&scaff, kn->iattr->ia_secdata, + kn->iattr->ia_secdata_len,0 ); +security_release_secctx (&scaff); + }simple_xattrs_free (&kn->iattr->xattrs);kmem_cache_free (kernfs_iattrs_cache, kn->iattr); }fs/kernfs/inode.c +5
-2@@ -349,6 +349,7 @@ static int kernfs_security_xattr_set(const struct xattr_handler *handler, {struct kernfs_node *kn = inode->i_private;struct kernfs_iattrs *attrs; +struct lsmcontext context;void *secdata;u32 secdata_len =0 ;int error;@@ -368,8 +369,10 @@ static int kernfs_security_xattr_set(const struct xattr_handler *handler, error =kernfs_node_setsecdata (attrs, &secdata, &secdata_len);mutex_unlock (&kernfs_mutex); -if (secdata) -security_release_secctx (secdata, secdata_len); +if (secdata) { +lsmcontext_init (&context, secdata, secdata_len,0 ); +security_release_secctx (&context); + }return error; }fs/nfs/nfs4proc.c +6
-2@@ -131,8 +131,12 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,static inline void nfs4_label_release_security (struct nfs4_label *label) { -if (label) -security_release_secctx (label->label, label->len); +struct lsmcontext scaff;/* scaffolding */ + +if (label) { +lsmcontext_init (&scaff, label->label, label->len,0 ); +security_release_secctx (&scaff); + } }static inline u32 *nfs4_bitmask (struct nfs_server *server,struct nfs4_label *label) {fs/nfsd/nfs4xdr.c +5
-2@@ -2420,6 +2420,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,__be32 status;int err;struct nfs4_acl *acl =NULL ; +struct lsmcontext scaff;/* scaffolding */ void *context =NULL ;int contextlen;bool contextsupport = false;@@ -2919,8 +2920,10 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, out:#ifdef CONFIG_NFSD_V4_SECURITY_LABEL -if (context) -security_release_secctx (context, contextlen); +if (context) { +lsmcontext_init (&scaff, context, contextlen,0 );/*scaffolding*/ +security_release_secctx (&scaff); + }#endif /* CONFIG_NFSD_V4_SECURITY_LABEL */ kfree (acl);if (tempfh) {include/linux/security.h +22
-0@@ -76,6 +76,39 @@ enum lsm_event { LSM_POLICY_CHANGE, }; +/* +* A "security context" is the text representation of +* the information used by LSMs. +* This structure contains the string, its length, and which LSM +* it is useful for. +*/ +struct lsmcontext { +char *context;/* Provided by the module */ +u32 len; +int slot;/* Identifies the module */ +}; + +/** +* lsmcontext_init - initialize an lsmcontext structure. +* @cp: Pointer to the context to initialize +* @context: Initial context, or NULL +* @size: Size of context, or 0 +* @slot: Which LSM provided the context +* +* Fill in the lsmcontext from the provided information. +*/ +static inline void lsmcontext_init(struct lsmcontext *cp, char *context,
include/linux/security.h enum lsm_event { · line 110
Quoted 10 lines
include/linux/security.h +10
-0+ u32 size, int slot) +{ + cp->slot = slot; + cp->context = context; + +if (context ==NULL || size ==0 ) + cp->len =0 ; +else + cp->len =strlen (context); +}
I worry about the use of the "size" argument (or rather, lack of use). If all contexts are going to be NUL-terminated strings, there should be no "size" arg. If not, then "size" (or strneln(context, size)) should be used instead of strlen().
Quoted 431 lines
include/linux/security.h +3
-2+/* * Data exported by the security modules */ @@ -445,7 +478,7 @@ int security_ismaclabel(const char *name);int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *l); -void security_release_secctx (char *secdata,u32 seclen); +void security_release_secctx (struct lsmcontext *cp);void security_inode_invalidate_secctx (struct inode *inode);int security_inode_notifysecctx (struct inode *inode,void *ctx,u32 ctxlen);@@ -1236,7 +1269,7 @@ static inline int security_secctx_to_secid(const char *secdata,return -EOPNOTSUPP ; } -static inline void security_release_secctx (char *secdata,u32 seclen) +static inline void security_release_secctx (struct lsmcontext *cp) { }include/net/scm.h +3
-1@@ -92,6 +92,7 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,#ifdef CONFIG_SECURITY_NETWORK static inline void scm_passec (struct socket *sock,struct msghdr *msg,struct scm_cookie *scm) { +struct lsmcontext context;char *secdata;u32 seclen;int err;@@ -101,7 +102,8 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scif (!err) {put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , seclen, secdata); -security_release_secctx (secdata, seclen); +lsmcontext_init (&context, secdata, seclen,0 );/*scaffolding*/ +security_release_secctx (&context); } } }kernel/audit.c +10
-4@@ -1193,6 +1193,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)struct audit_sig_info *sig_data;char *ctx =NULL ;u32 len; +struct lsmcontext scaff;/* scaffolding */ err =audit_netlink_ok (skb, msg_type);if (err)@@ -1437,15 +1438,18 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) } sig_data =kmalloc (sizeof (*sig_data) + len,GFP_KERNEL );if (!sig_data) { -if (lsmblob_is_set (&audit_sig_lsm)) -security_release_secctx (ctx, len); +if (lsmblob_is_set (&audit_sig_lsm)) { +lsmcontext_init (&scaff, ctx, len,0 ); +security_release_secctx (&scaff); + }return -ENOMEM ; } sig_data->uid =from_kuid (&init_user_ns, audit_sig_uid); sig_data->pid = audit_sig_pid;if (lsmblob_is_set (&audit_sig_lsm)) {memcpy (sig_data->ctx, ctx, len); -security_release_secctx (ctx, len); +lsmcontext_init (&scaff, ctx, len,0 ); +security_release_secctx (&scaff); }audit_send_reply (skb, seq,AUDIT_SIGNAL_INFO ,0 ,0 , sig_data,sizeof (*sig_data) + len);@@ -2074,6 +2078,7 @@ int audit_log_task_context(struct audit_buffer *ab)unsigned len;int error;struct lsmblob le; +struct lsmcontext scaff;/* scaffolding */ security_task_getsecid (current, &le);if (!lsmblob_is_set (&le))@@ -2087,7 +2092,8 @@ int audit_log_task_context(struct audit_buffer *ab) }audit_log_format (ab," subj=%s" , ctx); -security_release_secctx (ctx, len); +lsmcontext_init (&scaff, ctx, len,0 ); +security_release_secctx (&scaff);return 0 ; error_path:kernel/auditsc.c +9
-3@@ -942,6 +942,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, struct lsmblob *l, char *comm) { struct audit_buffer *ab; +struct lsmcontext lsmcxt;char *ctx =NULL ;u32 len;int rc =0 ;@@ -959,7 +960,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, rc =1 ; }else {audit_log_format (ab," obj=%s" , ctx); -security_release_secctx (ctx, len); +lsmcontext_init (&lsmcxt, ctx, len,0 );/*scaffolding*/ +security_release_secctx (&lsmcxt); } }audit_log_format (ab," ocomm=" );@@ -1171,6 +1173,7 @@ static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name)static void show_special (struct audit_context *context,int *call_panic) { +struct lsmcontext lsmcxt;struct audit_buffer *ab;int i;@@ -1203,7 +1206,8 @@ static void show_special(struct audit_context *context, int *call_panic) *call_panic =1 ; }else {audit_log_format (ab," obj=%s" , ctx); -security_release_secctx (ctx, len); +lsmcontext_init (&lsmcxt, ctx, len,0 ); +security_release_secctx (&lsmcxt); } }if (context->ipc.has_perm) {@@ -1350,6 +1354,7 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,char *ctx =NULL ;u32 len;struct lsmblob le; +struct lsmcontext lsmcxt;lsmblob_init (&le, n->osid);if (security_secid_to_secctx (&le, &ctx, &len)) {@@ -1358,7 +1363,8 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n, *call_panic =2 ; }else {audit_log_format (ab," obj=%s" , ctx); -security_release_secctx (ctx, len); +lsmcontext_init (&lsmcxt, ctx, len,0 );/* scaffolding */ +security_release_secctx (&lsmcxt); } }net/ipv4/ip_sockglue.c +3
-1@@ -130,6 +130,7 @@ static void ip_cmsg_recv_checksum(struct msghdr *msg, struct sk_buff *skb,static void ip_cmsg_recv_security (struct msghdr *msg,struct sk_buff *skb) { +struct lsmcontext context;struct lsmblob lb;char *secdata;u32 seclen;@@ -144,7 +145,8 @@ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb)return ;put_cmsg (msg,SOL_IP ,SCM_SECURITY , seclen, secdata); -security_release_secctx (secdata, seclen); +lsmcontext_init (&context, secdata, seclen,0 );/* scaffolding */ +security_release_secctx (&context); }static void ip_cmsg_recv_dstaddr (struct msghdr *msg,struct sk_buff *skb)net/netfilter/nf_conntrack_netlink.c +3
-1@@ -331,6 +331,7 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)int len, ret;char *secctx;struct lsmblob le; +struct lsmcontext context;lsmblob_init (&le, ct->secmark); ret =security_secid_to_secctx (&le, &secctx, &len);@@ -348,7 +349,8 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct) ret =0 ; nla_put_failure: -security_release_secctx (secctx, len); +lsmcontext_init (&context, secctx, len,0 );/* scaffolding */ +security_release_secctx (&context); return ret; }#else net/netfilter/nf_conntrack_standalone.c +3
-1@@ -176,6 +176,7 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)u32 len;char *secctx;struct lsmblob le; +struct lsmcontext context;lsmblob_init (&le, ct->secmark); ret =security_secid_to_secctx (&le, &secctx, &len);@@ -184,7 +185,8 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)seq_printf (s,"secctx=%s " , secctx); - security_release_secctx(secctx, len); +lsmcontext_init (&context, secctx, len,0 );/* scaffolding */ + security_release_secctx(&context); }#else static inline void ct_show_secctx (struct seq_file *s,const struct nf_conn *ct)net/netfilter/nfnetlink_queue.c +9
-4@@ -399,6 +399,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,enum ip_conntrack_info uninitialized_var (ctinfo );struct nfnl_ct_hook *nfnl_ct;bool csum_verify; +struct lsmcontext scaff;/* scaffolding */ char *secdata =NULL ;u32 seclen =0 ;@@ -629,8 +630,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, } nlh->nlmsg_len = skb->len; -if (seclen) -security_release_secctx (secdata, seclen); +if (seclen) { +lsmcontext_init (&scaff, secdata, seclen,0 ); +security_release_secctx (&scaff); + }return skb; nla_put_failure:@@ -638,8 +641,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,kfree_skb (skb);net_err_ratelimited ("nf_queue: error creating packet message\n" ); nlmsg_failure: -if (seclen) -security_release_secctx (secdata, seclen); +if (seclen) { +lsmcontext_init (&scaff, secdata, seclen,0 ); +security_release_secctx (&scaff); + }return NULL ; }net/netlabel/netlabel_unlabeled.c +15
-4@@ -387,6 +387,7 @@ int netlbl_unlhsh_add(struct net *net,struct net_device *dev;struct netlbl_unlhsh_iface *iface;struct audit_buffer *audit_buf =NULL ; +struct lsmcontext context;char *secctx =NULL ;u32 secctx_len;struct lsmblob le;@@ -457,7 +458,9 @@ int netlbl_unlhsh_add(struct net *net, &secctx, &secctx_len) == 0) {audit_log_format (audit_buf," sec_obj=%s" , secctx); -security_release_secctx (secctx, secctx_len); +/* scaffolding */ +lsmcontext_init (&context, secctx, secctx_len,0 ); +security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , ret_val ==0 ?1 :0 );audit_log_end (audit_buf);@@ -488,6 +491,7 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,struct netlbl_unlhsh_addr4 *entry;struct audit_buffer *audit_buf;struct net_device *dev; +struct lsmcontext context;char *secctx;u32 secctx_len;struct lsmblob le;@@ -516,7 +520,9 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, security_secid_to_secctx(&le, &secctx, &secctx_len) == 0) {audit_log_format (audit_buf," sec_obj=%s" , secctx); -security_release_secctx (secctx, secctx_len); +/* scaffolding */ +lsmcontext_init (&context, secctx, secctx_len,0 ); +security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , entry !=NULL ?1 :0 );audit_log_end (audit_buf);@@ -553,6 +559,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,struct netlbl_unlhsh_addr6 *entry;struct audit_buffer *audit_buf;struct net_device *dev; +struct lsmcontext context;char *secctx;u32 secctx_len;struct lsmblob le;@@ -580,7 +587,8 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, security_secid_to_secctx(&le, &secctx, &secctx_len) == 0) {audit_log_format (audit_buf," sec_obj=%s" , secctx); -security_release_secctx (secctx, secctx_len); +lsmcontext_init (&context, secctx, secctx_len,0 ); +security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , entry !=NULL ?1 :0 );audit_log_end (audit_buf);@@ -1094,6 +1102,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,int ret_val = -ENOMEM ;struct netlbl_unlhsh_walk_arg *cb_arg = arg;struct net_device *dev; +struct lsmcontext context;void *data;u32 secid;char *secctx;@@ -1161,7 +1170,9 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,NLBL_UNLABEL_A_SECCTX , secctx_len, secctx); -security_release_secctx (secctx, secctx_len); +/* scaffolding */ +lsmcontext_init (&context, secctx, secctx_len,0 ); +security_release_secctx (&context);if (ret_val !=0 ) goto list_cb_failure;net/netlabel/netlabel_user.c +3
-1@@ -98,6 +98,7 @@ struct audit_buffer *netlbl_audit_start_common(int type, struct netlbl_audit *audit_info) {struct audit_buffer *audit_buf; +struct lsmcontext context;char *secctx;u32 secctx_len;struct lsmblob le;@@ -117,7 +118,8 @@ struct audit_buffer *netlbl_audit_start_common(int type,if (audit_info->secid !=0 &&security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," subj=%s" , secctx); -security_release_secctx (secctx, secctx_len); +lsmcontext_init (&context, secctx, secctx_len,0 );/*scaffolding*/ +security_release_secctx (&context); }return audit_buf;security/security.c +8
-4@@ -458,6 +458,7 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count, &security_hook_heads.socket_getpeersec_dgram || hooks[i].head == &security_hook_heads.secctx_to_secid || hooks[i].head == &security_hook_heads.secid_to_secctx || + hooks[i].head == &security_hook_heads.release_secctx || hooks[i].head == &security_hook_heads.ipc_getsecid || hooks[i].head == &security_hook_heads.task_getsecid || hooks[i].head == &security_hook_heads.inode_getsecid ||@@ -2083,16 +2084,19 @@ int security_secctx_to_secid(const char *secdata, u32 seclen, struct lsmblob *l) }EXPORT_SYMBOL (security_secctx_to_secid); -void security_release_secctx (char *secdata,u32 seclen) +void security_release_secctx (struct lsmcontext *cp) { -int *display = current->security;struct security_hook_list *hp;hlist_for_each_entry (hp, &security_hook_heads.release_secctx, list) -if (*display ==LSMDATA_INVALID || *display == hp->slot) { - hp->hook.release_secctx (secdata, seclen); +if (cp->slot == hp->slot) { + hp->hook.release_secctx (cp->context, cp->len); +lsmcontext_init (cp,NULL ,0 ,0 );return ; } + +pr_warn ("%s context \"%s\" from slot %d not released\n" , __func__, + cp->context, cp->slot); }EXPORT_SYMBOL (security_release_secctx);security/smack/smack_lsm.c +10
-4@@ -4439,11 +4439,16 @@ static int smack_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid)return 0 ; } -/* -* There used to be a smack_release_secctx hook -* that did nothing back when hooks were in a vector. -* Now that there's a list such a hook adds cost. +/** +* smack_release_secctx - do everything necessary to free a context +* @secdata: Unused +* @seclen: Unused +* +* Do nothing but hold a slot in the hooks list. */ +static void smack_release_secctx (char *secdata,u32 seclen) +{ +}static int smack_inode_notifysecctx (struct inode *inode,void *ctx,u32 ctxlen) {@@ -4683,6 +4688,7 @@ static struct security_hook_list smack_hooks[] __lsm_ro_after_init = {LSM_HOOK_INIT (ismaclabel, smack_ismaclabel),LSM_HOOK_INIT (secid_to_secctx, smack_secid_to_secctx),LSM_HOOK_INIT (secctx_to_secid, smack_secctx_to_secid), +LSM_HOOK_INIT (release_secctx, smack_release_secctx),LSM_HOOK_INIT (inode_notifysecctx, smack_inode_notifysecctx),LSM_HOOK_INIT (inode_setsecctx, smack_inode_setsecctx), LSM_HOOK_INIT(inode_getsecctx, smack_inode_getsecctx),Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerRe: [PATCH v2 16/25] LSM: Ensure the correct LSM context releaser
Quoted 195 lines · Kees Cook
Quoted 194 lines · Casey Schaufler
Add a new lsmcontext data structure to hold all the information about a "security context", including the string, its size and which LSM allocated the string. The allocation information is necessary because LSMs have different policies regarding the lifecycle of these strings. SELinux allocates and destroys them on each use, whereas Smack provides a pointer to an entry in a list that never goes away.
Change the
security_release_secctx()interface to use the lsmcontext and call only the appropiate LSM hook. Change the callers ofsecurity_release_secctx()to provide the correct type of data, introducing scaffolding where required.Signed-off-by Casey Schaufler <[email protected]>--- drivers/android/binder.c | 10 +++++-- fs/kernfs/dir.c | 9 ++++-- fs/kernfs/inode.c | 7 +++-- fs/nfs/nfs4proc.c | 8 ++++-- fs/nfsd/nfs4xdr.c | 7 +++-- include/linux/security.h | 37 +++++++++++++++++++++++-- include/net/scm.h | 4 ++- kernel/audit.c | 14 +++++++--- kernel/auditsc.c | 12 ++++++-- net/ipv4/ip_sockglue.c | 4 ++- net/netfilter/nf_conntrack_netlink.c | 4 ++- net/netfilter/nf_conntrack_standalone.c | 4 ++- net/netfilter/nfnetlink_queue.c | 13 ++++++--- net/netlabel/netlabel_unlabeled.c | 19 ++++++++++--- net/netlabel/netlabel_user.c | 4 ++- security/security.c | 12 +++++--- security/smack/smack_lsm.c | 14 +++++++--- 17 files changed, 140 insertions(+), 42 deletions(-)drivers/android/binder.c +7
-3@@ -2876,6 +2876,7 @@ static void binder_transaction(struct binder_proc *proc,int t_debug_id =atomic_inc_return (&binder_last_id);char *secctx =NULL ;u32 secctx_sz =0 ; +struct lsmcontext scaff;/* scaffolding */ e =binder_transaction_log_add (&binder_transaction_log); e->debug_id = t_debug_id;@@ -3158,7 +3159,8 @@ static void binder_transaction(struct binder_proc *proc,binder_alloc_copy_to_buffer (&target_proc->alloc, t->buffer, buf_offset, secctx, secctx_sz); -security_release_secctx (secctx, secctx_sz); +lsmcontext_init (&scaff, secctx, secctx_sz,0 ); +security_release_secctx (&scaff); secctx =NULL ; } t->buffer->debug_id = t->debug_id;@@ -3479,8 +3481,10 @@ static void binder_transaction(struct binder_proc *proc, t->buffer->transaction =NULL ;binder_alloc_free_buf (&target_proc->alloc, t->buffer); err_binder_alloc_buf_failed: -if (secctx) -security_release_secctx (secctx, secctx_sz); +if (secctx) { +lsmcontext_init (&scaff, secctx, secctx_sz,0 ); +security_release_secctx (&scaff); + } err_get_secctx_failed:kfree (tcomplete);binder_stats_deleted (BINDER_STAT_TRANSACTION_COMPLETE );fs/kernfs/dir.c +6
-3@@ -532,9 +532,12 @@ void kernfs_put(struct kernfs_node *kn)kfree_const (kn->name);if (kn->iattr) { -if (kn->iattr->ia_secdata) -security_release_secctx (kn->iattr->ia_secdata, - kn->iattr->ia_secdata_len); +struct lsmcontext scaff;/* scaffolding */ +if (kn->iattr->ia_secdata) { +lsmcontext_init (&scaff, kn->iattr->ia_secdata, + kn->iattr->ia_secdata_len,0 ); +security_release_secctx (&scaff); + }simple_xattrs_free (&kn->iattr->xattrs);kmem_cache_free (kernfs_iattrs_cache, kn->iattr); }fs/kernfs/inode.c +5
-2@@ -349,6 +349,7 @@ static int kernfs_security_xattr_set(const struct xattr_handler *handler, {struct kernfs_node *kn = inode->i_private;struct kernfs_iattrs *attrs; +struct lsmcontext context;void *secdata;u32 secdata_len =0 ;int error;@@ -368,8 +369,10 @@ static int kernfs_security_xattr_set(const struct xattr_handler *handler, error =kernfs_node_setsecdata (attrs, &secdata, &secdata_len);mutex_unlock (&kernfs_mutex); -if (secdata) -security_release_secctx (secdata, secdata_len); +if (secdata) { +lsmcontext_init (&context, secdata, secdata_len,0 ); +security_release_secctx (&context); + }return error; }fs/nfs/nfs4proc.c +6
-2@@ -131,8 +131,12 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,static inline void nfs4_label_release_security (struct nfs4_label *label) { -if (label) -security_release_secctx (label->label, label->len); +struct lsmcontext scaff;/* scaffolding */ + +if (label) { +lsmcontext_init (&scaff, label->label, label->len,0 ); +security_release_secctx (&scaff); + } }static inline u32 *nfs4_bitmask (struct nfs_server *server,struct nfs4_label *label) {fs/nfsd/nfs4xdr.c +5
-2@@ -2420,6 +2420,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,__be32 status;int err;struct nfs4_acl *acl =NULL ; +struct lsmcontext scaff;/* scaffolding */ void *context =NULL ;int contextlen;bool contextsupport = false;@@ -2919,8 +2920,10 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, out:#ifdef CONFIG_NFSD_V4_SECURITY_LABEL -if (context) -security_release_secctx (context, contextlen); +if (context) { +lsmcontext_init (&scaff, context, contextlen,0 );/*scaffolding*/ +security_release_secctx (&scaff); + }#endif /* CONFIG_NFSD_V4_SECURITY_LABEL */ kfree (acl);if (tempfh) {include/linux/security.h +28
-0@@ -76,6 +76,39 @@ enum lsm_event { LSM_POLICY_CHANGE, }; +/* +* A "security context" is the text representation of +* the information used by LSMs. +* This structure contains the string, its length, and which LSM +* it is useful for. +*/ +struct lsmcontext { +char *context;/* Provided by the module */ +u32 len; +int slot;/* Identifies the module */ +}; + +/** +* lsmcontext_init - initialize an lsmcontext structure. +* @cp: Pointer to the context to initialize +* @context: Initial context, or NULL +* @size: Size of context, or 0 +* @slot: Which LSM provided the context +* +* Fill in the lsmcontext from the provided information. +*/ +static inline void lsmcontext_init (struct lsmcontext *cp,char *context, +u32 size,int slot) +{ + cp->slot = slot; + cp->context = context; + +if (context ==NULL || size ==0 )
Quoted 8 lines
include/linux/security.h enum lsm_event { · line 110
Quoted 4 lines
include/linux/security.h +4
-0+ cp->len =0 ; + else + cp->len = strlen(context); +}I worry about the use of the "size" argument (or rather, lack of use). If all contexts are going to be NUL-terminated strings, there should be no "size" arg. If not, then "size" (or
strneln(context, size)) should be used instead ofstrlen().
Once the scaffolding uses go away this is only ever called once, with lsmcontext_init(cp, NULL, 0, 0) in security_release_secctx(). It probably makes the most sense to identify this as "for scaffolding" and delete it when it is no longer needed.
Quoted 431 lines
Quoted 431 lines
include/linux/security.h +3
-2+/* * Data exported by the security modules */ @@ -445,7 +478,7 @@ int security_ismaclabel(const char *name);int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *l); -void security_release_secctx (char *secdata,u32 seclen); +void security_release_secctx (struct lsmcontext *cp);void security_inode_invalidate_secctx (struct inode *inode);int security_inode_notifysecctx (struct inode *inode,void *ctx,u32 ctxlen);@@ -1236,7 +1269,7 @@ static inline int security_secctx_to_secid(const char *secdata,return -EOPNOTSUPP ; } -static inline void security_release_secctx (char *secdata,u32 seclen) +static inline void security_release_secctx (struct lsmcontext *cp) { }include/net/scm.h +3
-1@@ -92,6 +92,7 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,#ifdef CONFIG_SECURITY_NETWORK static inline void scm_passec (struct socket *sock,struct msghdr *msg,struct scm_cookie *scm) { +struct lsmcontext context;char *secdata;u32 seclen;int err;@@ -101,7 +102,8 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct scif (!err) {put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , seclen, secdata); -security_release_secctx (secdata, seclen); +lsmcontext_init (&context, secdata, seclen,0 );/*scaffolding*/ +security_release_secctx (&context); } } }kernel/audit.c +10
-4@@ -1193,6 +1193,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)struct audit_sig_info *sig_data;char *ctx =NULL ;u32 len; +struct lsmcontext scaff;/* scaffolding */ err =audit_netlink_ok (skb, msg_type);if (err)@@ -1437,15 +1438,18 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) } sig_data =kmalloc (sizeof (*sig_data) + len,GFP_KERNEL );if (!sig_data) { -if (lsmblob_is_set (&audit_sig_lsm)) -security_release_secctx (ctx, len); +if (lsmblob_is_set (&audit_sig_lsm)) { +lsmcontext_init (&scaff, ctx, len,0 ); +security_release_secctx (&scaff); + }return -ENOMEM ; } sig_data->uid =from_kuid (&init_user_ns, audit_sig_uid); sig_data->pid = audit_sig_pid;if (lsmblob_is_set (&audit_sig_lsm)) {memcpy (sig_data->ctx, ctx, len); -security_release_secctx (ctx, len); +lsmcontext_init (&scaff, ctx, len,0 ); +security_release_secctx (&scaff); }audit_send_reply (skb, seq,AUDIT_SIGNAL_INFO ,0 ,0 , sig_data,sizeof (*sig_data) + len);@@ -2074,6 +2078,7 @@ int audit_log_task_context(struct audit_buffer *ab)unsigned len;int error;struct lsmblob le; +struct lsmcontext scaff;/* scaffolding */ security_task_getsecid (current, &le);if (!lsmblob_is_set (&le))@@ -2087,7 +2092,8 @@ int audit_log_task_context(struct audit_buffer *ab) }audit_log_format (ab," subj=%s" , ctx); -security_release_secctx (ctx, len); +lsmcontext_init (&scaff, ctx, len,0 ); +security_release_secctx (&scaff);return 0 ; error_path:kernel/auditsc.c +9
-3@@ -942,6 +942,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, struct lsmblob *l, char *comm) { struct audit_buffer *ab; +struct lsmcontext lsmcxt;char *ctx =NULL ;u32 len;int rc =0 ;@@ -959,7 +960,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, rc =1 ; }else {audit_log_format (ab," obj=%s" , ctx); -security_release_secctx (ctx, len); +lsmcontext_init (&lsmcxt, ctx, len,0 );/*scaffolding*/ +security_release_secctx (&lsmcxt); } }audit_log_format (ab," ocomm=" );@@ -1171,6 +1173,7 @@ static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name)static void show_special (struct audit_context *context,int *call_panic) { +struct lsmcontext lsmcxt;struct audit_buffer *ab;int i;@@ -1203,7 +1206,8 @@ static void show_special(struct audit_context *context, int *call_panic) *call_panic =1 ; }else {audit_log_format (ab," obj=%s" , ctx); -security_release_secctx (ctx, len); +lsmcontext_init (&lsmcxt, ctx, len,0 ); +security_release_secctx (&lsmcxt); } }if (context->ipc.has_perm) {@@ -1350,6 +1354,7 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,char *ctx =NULL ;u32 len;struct lsmblob le; +struct lsmcontext lsmcxt;lsmblob_init (&le, n->osid);if (security_secid_to_secctx (&le, &ctx, &len)) {@@ -1358,7 +1363,8 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n, *call_panic =2 ; }else {audit_log_format (ab," obj=%s" , ctx); -security_release_secctx (ctx, len); +lsmcontext_init (&lsmcxt, ctx, len,0 );/* scaffolding */ +security_release_secctx (&lsmcxt); } }net/ipv4/ip_sockglue.c +3
-1@@ -130,6 +130,7 @@ static void ip_cmsg_recv_checksum(struct msghdr *msg, struct sk_buff *skb,static void ip_cmsg_recv_security (struct msghdr *msg,struct sk_buff *skb) { +struct lsmcontext context;struct lsmblob lb;char *secdata;u32 seclen;@@ -144,7 +145,8 @@ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb)return ;put_cmsg (msg,SOL_IP ,SCM_SECURITY , seclen, secdata); -security_release_secctx (secdata, seclen); +lsmcontext_init (&context, secdata, seclen,0 );/* scaffolding */ +security_release_secctx (&context); }static void ip_cmsg_recv_dstaddr (struct msghdr *msg,struct sk_buff *skb)net/netfilter/nf_conntrack_netlink.c +3
-1@@ -331,6 +331,7 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)int len, ret;char *secctx;struct lsmblob le; +struct lsmcontext context;lsmblob_init (&le, ct->secmark); ret =security_secid_to_secctx (&le, &secctx, &len);@@ -348,7 +349,8 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct) ret =0 ; nla_put_failure: -security_release_secctx (secctx, len); +lsmcontext_init (&context, secctx, len,0 );/* scaffolding */ +security_release_secctx (&context); return ret; }#else net/netfilter/nf_conntrack_standalone.c +3
-1@@ -176,6 +176,7 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)u32 len;char *secctx;struct lsmblob le; +struct lsmcontext context;lsmblob_init (&le, ct->secmark); ret =security_secid_to_secctx (&le, &secctx, &len);@@ -184,7 +185,8 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)seq_printf (s,"secctx=%s " , secctx); - security_release_secctx(secctx, len); +lsmcontext_init (&context, secctx, len,0 );/* scaffolding */ + security_release_secctx(&context); }#else static inline void ct_show_secctx (struct seq_file *s,const struct nf_conn *ct)net/netfilter/nfnetlink_queue.c +9
-4@@ -399,6 +399,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,enum ip_conntrack_info uninitialized_var (ctinfo );struct nfnl_ct_hook *nfnl_ct;bool csum_verify; +struct lsmcontext scaff;/* scaffolding */ char *secdata =NULL ;u32 seclen =0 ;@@ -629,8 +630,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, } nlh->nlmsg_len = skb->len; -if (seclen) -security_release_secctx (secdata, seclen); +if (seclen) { +lsmcontext_init (&scaff, secdata, seclen,0 ); +security_release_secctx (&scaff); + }return skb; nla_put_failure:@@ -638,8 +641,10 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,kfree_skb (skb);net_err_ratelimited ("nf_queue: error creating packet message\n" ); nlmsg_failure: -if (seclen) -security_release_secctx (secdata, seclen); +if (seclen) { +lsmcontext_init (&scaff, secdata, seclen,0 ); +security_release_secctx (&scaff); + }return NULL ; }net/netlabel/netlabel_unlabeled.c +15
-4@@ -387,6 +387,7 @@ int netlbl_unlhsh_add(struct net *net,struct net_device *dev;struct netlbl_unlhsh_iface *iface;struct audit_buffer *audit_buf =NULL ; +struct lsmcontext context;char *secctx =NULL ;u32 secctx_len;struct lsmblob le;@@ -457,7 +458,9 @@ int netlbl_unlhsh_add(struct net *net, &secctx, &secctx_len) == 0) {audit_log_format (audit_buf," sec_obj=%s" , secctx); -security_release_secctx (secctx, secctx_len); +/* scaffolding */ +lsmcontext_init (&context, secctx, secctx_len,0 ); +security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , ret_val ==0 ?1 :0 );audit_log_end (audit_buf);@@ -488,6 +491,7 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,struct netlbl_unlhsh_addr4 *entry;struct audit_buffer *audit_buf;struct net_device *dev; +struct lsmcontext context;char *secctx;u32 secctx_len;struct lsmblob le;@@ -516,7 +520,9 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, security_secid_to_secctx(&le, &secctx, &secctx_len) == 0) {audit_log_format (audit_buf," sec_obj=%s" , secctx); -security_release_secctx (secctx, secctx_len); +/* scaffolding */ +lsmcontext_init (&context, secctx, secctx_len,0 ); +security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , entry !=NULL ?1 :0 );audit_log_end (audit_buf);@@ -553,6 +559,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,struct netlbl_unlhsh_addr6 *entry;struct audit_buffer *audit_buf;struct net_device *dev; +struct lsmcontext context;char *secctx;u32 secctx_len;struct lsmblob le;@@ -580,7 +587,8 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, security_secid_to_secctx(&le, &secctx, &secctx_len) == 0) {audit_log_format (audit_buf," sec_obj=%s" , secctx); -security_release_secctx (secctx, secctx_len); +lsmcontext_init (&context, secctx, secctx_len,0 ); +security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , entry !=NULL ?1 :0 );audit_log_end (audit_buf);@@ -1094,6 +1102,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,int ret_val = -ENOMEM ;struct netlbl_unlhsh_walk_arg *cb_arg = arg;struct net_device *dev; +struct lsmcontext context;void *data;u32 secid;char *secctx;@@ -1161,7 +1170,9 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,NLBL_UNLABEL_A_SECCTX , secctx_len, secctx); -security_release_secctx (secctx, secctx_len); +/* scaffolding */ +lsmcontext_init (&context, secctx, secctx_len,0 ); +security_release_secctx (&context);if (ret_val !=0 ) goto list_cb_failure;net/netlabel/netlabel_user.c +3
-1@@ -98,6 +98,7 @@ struct audit_buffer *netlbl_audit_start_common(int type, struct netlbl_audit *audit_info) {struct audit_buffer *audit_buf; +struct lsmcontext context;char *secctx;u32 secctx_len;struct lsmblob le;@@ -117,7 +118,8 @@ struct audit_buffer *netlbl_audit_start_common(int type,if (audit_info->secid !=0 &&security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," subj=%s" , secctx); -security_release_secctx (secctx, secctx_len); +lsmcontext_init (&context, secctx, secctx_len,0 );/*scaffolding*/ +security_release_secctx (&context); }return audit_buf;security/security.c +8
-4@@ -458,6 +458,7 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count, &security_hook_heads.socket_getpeersec_dgram || hooks[i].head == &security_hook_heads.secctx_to_secid || hooks[i].head == &security_hook_heads.secid_to_secctx || + hooks[i].head == &security_hook_heads.release_secctx || hooks[i].head == &security_hook_heads.ipc_getsecid || hooks[i].head == &security_hook_heads.task_getsecid || hooks[i].head == &security_hook_heads.inode_getsecid ||@@ -2083,16 +2084,19 @@ int security_secctx_to_secid(const char *secdata, u32 seclen, struct lsmblob *l) }EXPORT_SYMBOL (security_secctx_to_secid); -void security_release_secctx (char *secdata,u32 seclen) +void security_release_secctx (struct lsmcontext *cp) { -int *display = current->security;struct security_hook_list *hp;hlist_for_each_entry (hp, &security_hook_heads.release_secctx, list) -if (*display ==LSMDATA_INVALID || *display == hp->slot) { - hp->hook.release_secctx (secdata, seclen); +if (cp->slot == hp->slot) { + hp->hook.release_secctx (cp->context, cp->len); +lsmcontext_init (cp,NULL ,0 ,0 );return ; } + +pr_warn ("%s context \"%s\" from slot %d not released\n" , __func__, + cp->context, cp->slot); }EXPORT_SYMBOL (security_release_secctx);security/smack/smack_lsm.c +10
-4@@ -4439,11 +4439,16 @@ static int smack_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid)return 0 ; } -/* -* There used to be a smack_release_secctx hook -* that did nothing back when hooks were in a vector. -* Now that there's a list such a hook adds cost. +/** +* smack_release_secctx - do everything necessary to free a context +* @secdata: Unused +* @seclen: Unused +* +* Do nothing but hold a slot in the hooks list. */ +static void smack_release_secctx (char *secdata,u32 seclen) +{ +}static int smack_inode_notifysecctx (struct inode *inode,void *ctx,u32 ctxlen) {@@ -4683,6 +4688,7 @@ static struct security_hook_list smack_hooks[] __lsm_ro_after_init = {LSM_HOOK_INIT (ismaclabel, smack_ismaclabel),LSM_HOOK_INIT (secid_to_secctx, smack_secid_to_secctx),LSM_HOOK_INIT (secctx_to_secid, smack_secctx_to_secid), +LSM_HOOK_INIT (release_secctx, smack_release_secctx),LSM_HOOK_INIT (inode_notifysecctx, smack_inode_notifysecctx),LSM_HOOK_INIT (inode_setsecctx, smack_inode_setsecctx), LSM_HOOK_INIT(inode_getsecctx, smack_inode_getsecctx),Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 17/25 LSM: Use lsmcontext in security_secid_to_secctx
In reply to Casey SchauflerReplace the (secctx,seclen) pointer pair with a single lsmcontext pointer to allow return of the LSM identifier along with the context and context length. This allows security_release_secctx() to know how to release the context. Callers have been modified to use or save the returned data from the new structure.
--- drivers/android/binder.c | 24 ++++++--------- include/linux/security.h | 4 +-- include/net/scm.h | 8 ++--- kernel/audit.c | 29 +++++++----------- kernel/auditsc.c | 31 +++++++------------ net/ipv4/ip_sockglue.c | 7 ++--- net/netfilter/nf_conntrack_netlink.c | 14 +++++---- net/netfilter/nf_conntrack_standalone.c | 7 ++--- net/netfilter/nfnetlink_queue.c | 5 +++- net/netlabel/netlabel_unlabeled.c | 40 ++++++++----------------- net/netlabel/netlabel_user.c | 7 ++--- security/security.c | 9 +++--- 12 files changed, 71 insertions(+), 114 deletions(-)
drivers/android/binder.c +9 -15
@@ -2874,9 +2874,7 @@ static void binder_transaction(struct binder_proc *proc,binder_size_t last_fixup_min_off =0 ;struct binder_context *context = proc->context;int t_debug_id =atomic_inc_return (&binder_last_id); -char *secctx =NULL ; -u32 secctx_sz =0 ; -struct lsmcontext scaff;/* scaffolding */ +struct lsmcontext lsmctx; e =binder_transaction_log_add (&binder_transaction_log); e->debug_id = t_debug_id;
@@ -3123,14 +3121,14 @@ static void binder_transaction(struct binder_proc *proc,struct lsmblob le;security_task_getsecid (proc->tsk, &le); - ret =security_secid_to_secctx (&le, &secctx, &secctx_sz); + ret =security_secid_to_secctx (&le, &lsmctx);if (ret) { return_error =BR_FAILED_REPLY ; return_error_param = ret; return_error_line = __LINE__; goto err_get_secctx_failed; } - extra_buffers_size +=ALIGN (secctx_sz,sizeof (u64)); + extra_buffers_size +=ALIGN (lsmctx.len,sizeof (u64)); }trace_binder_transaction (reply, t, target_node);
@@ -3149,19 +3147,17 @@ static void binder_transaction(struct binder_proc *proc, t->buffer =NULL ; goto err_binder_alloc_buf_failed; } -if (secctx) { +if (lsmctx.context) {size_t buf_offset =ALIGN (tr->data_size,sizeof (void *)) +ALIGN (tr->offsets_size,sizeof (void *)) +ALIGN (extra_buffers_size,sizeof (void *)) - -ALIGN (secctx_sz,sizeof (u64)); +ALIGN (lsmctx.len,sizeof (u64)); t->security_ctx = (uintptr_t )t->buffer->user_data + buf_offset;binder_alloc_copy_to_buffer (&target_proc->alloc, t->buffer, buf_offset, - secctx, secctx_sz); -lsmcontext_init (&scaff, secctx, secctx_sz,0 ); -security_release_secctx (&scaff); - secctx =NULL ; + lsmctx.context, lsmctx.len); +security_release_secctx (&lsmctx); } t->buffer->debug_id = t->debug_id; t->buffer->transaction = t;
@@ -3481,10 +3477,8 @@ static void binder_transaction(struct binder_proc *proc, t->buffer->transaction =NULL ;binder_alloc_free_buf (&target_proc->alloc, t->buffer); err_binder_alloc_buf_failed: -if (secctx) { -lsmcontext_init (&scaff, secctx, secctx_sz,0 ); -security_release_secctx (&scaff); - } +if (lsmctx.context) +security_release_secctx (&lsmctx); err_get_secctx_failed:kfree (tcomplete);binder_stats_deleted (BINDER_STAT_TRANSACTION_COMPLETE );
include/linux/security.h +2 -2
@@ -475,7 +475,7 @@ int security_setprocattr(const char *lsm, const char *name, void *value, size_t size);int security_netlink_send (struct sock *sk,struct sk_buff *skb);int security_ismaclabel (const char *name); -int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen); +int security_secid_to_secctx (struct lsmblob *l,struct lsmcontext *cp);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *l);void security_release_secctx (struct lsmcontext *cp);
@@ -1257,7 +1257,7 @@ static inline int security_ismaclabel(const char *name) }static inline int security_secid_to_secctx (struct lsmblob *l, -char **secdata,u32 *seclen) +struct lsmcontext *cp) {return -EOPNOTSUPP ; }
include/net/scm.h +3 -5
@@ -93,16 +93,14 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,static inline void scm_passec (struct socket *sock,struct msghdr *msg,struct scm_cookie *scm) {struct lsmcontext context; -char *secdata; -u32 seclen;int err;if (test_bit (SOCK_PASSSEC , &sock->flags)) { - err =security_secid_to_secctx (&scm->lsmblob, &secdata, &seclen); + err =security_secid_to_secctx (&scm->lsmblob, &context);if (!err) { -put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , seclen, secdata); -lsmcontext_init (&context, secdata, seclen,0 );/*scaffolding*/ +put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , + context.len, context.context);security_release_secctx (&context); } }
kernel/audit.c +11 -18
@@ -1191,9 +1191,8 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)struct audit_buffer *ab;u16 msg_type = nlh->nlmsg_type;struct audit_sig_info *sig_data; -char *ctx =NULL ;u32 len; -struct lsmcontext scaff;/* scaffolding */ +struct lsmcontext context; err =audit_netlink_ok (skb, msg_type);if (err)
@@ -1431,25 +1430,22 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)case AUDIT_SIGNAL_INFO : len =0 ;if (lsmblob_is_set (&audit_sig_lsm)) { - err =security_secid_to_secctx (&audit_sig_lsm, &ctx, - &len); + err =security_secid_to_secctx (&audit_sig_lsm, + &context);if (err)return err; } sig_data =kmalloc (sizeof (*sig_data) + len,GFP_KERNEL );if (!sig_data) { -if (lsmblob_is_set (&audit_sig_lsm)) { -lsmcontext_init (&scaff, ctx, len,0 ); -security_release_secctx (&scaff); - } +if (lsmblob_is_set (&audit_sig_lsm)) +security_release_secctx (&context);return -ENOMEM ; } sig_data->uid =from_kuid (&init_user_ns, audit_sig_uid); sig_data->pid = audit_sig_pid;if (lsmblob_is_set (&audit_sig_lsm)) { -memcpy (sig_data->ctx, ctx, len); -lsmcontext_init (&scaff, ctx, len,0 ); -security_release_secctx (&scaff); +memcpy (sig_data->ctx, context.context, context.len); +security_release_secctx (&context); }audit_send_reply (skb, seq,AUDIT_SIGNAL_INFO ,0 ,0 , sig_data,sizeof (*sig_data) + len);
@@ -2074,26 +2070,23 @@ void audit_log_key(struct audit_buffer *ab, char *key)int audit_log_task_context (struct audit_buffer *ab) { -char *ctx =NULL ; -unsigned len;int error;struct lsmblob le; -struct lsmcontext scaff;/* scaffolding */ +struct lsmcontext context;security_task_getsecid (current, &le);if (!lsmblob_is_set (&le))return 0 ; - error =security_secid_to_secctx (&le, &ctx, &len); + error =security_secid_to_secctx (&le, &context);if (error) {if (error != -EINVAL ) goto error_path;return 0 ; } -audit_log_format (ab," subj=%s" , ctx); -lsmcontext_init (&scaff, ctx, len,0 ); -security_release_secctx (&scaff); +audit_log_format (ab," subj=%s" , context.context); +security_release_secctx (&context);return 0 ; error_path:
kernel/auditsc.c +11 -20
@@ -942,9 +942,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, struct lsmblob *l, char *comm) { struct audit_buffer *ab; -struct lsmcontext lsmcxt; -char *ctx =NULL ; -u32 len; +struct lsmcontext lsmctx;int rc =0 ; ab =audit_log_start (context,GFP_KERNEL ,AUDIT_OBJ_PID );
@@ -955,13 +953,12 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,from_kuid (&init_user_ns, auid), from_kuid(&init_user_ns, uid), sessionid);if (lsmblob_is_set (l)) { -if (security_secid_to_secctx (l, &ctx, &len)) { +if (security_secid_to_secctx (l, &lsmctx)) {audit_log_format (ab," obj=(none)" ); rc =1 ; }else { -audit_log_format (ab," obj=%s" , ctx); -lsmcontext_init (&lsmcxt, ctx, len,0 );/*scaffolding*/ -security_release_secctx (&lsmcxt); +audit_log_format (ab," obj=%s" , lsmctx.context); +security_release_secctx (&lsmctx); } }audit_log_format (ab," ocomm=" );
@@ -1173,7 +1170,6 @@ static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name)static void show_special (struct audit_context *context,int *call_panic) { -struct lsmcontext lsmcxt;struct audit_buffer *ab;int i;
@@ -1197,16 +1193,14 @@ static void show_special(struct audit_context *context, int *call_panic)from_kgid (&init_user_ns, context->ipc.gid), context->ipc.mode);if (osid) { -char *ctx =NULL ; -u32 len; +struct lsmcontext lsmcxt;struct lsmblob le;lsmblob_init (&le, osid); -if (security_secid_to_secctx (&le, &ctx, &len)) { +if (security_secid_to_secctx (&le, &lsmcxt)) {audit_log_format (ab," osid=%u" , osid); *call_panic =1 ; }else { -audit_log_format (ab," obj=%s" , ctx); -lsmcontext_init (&lsmcxt, ctx, len,0 ); +audit_log_format (ab," obj=%s" , lsmcxt.context);security_release_secctx (&lsmcxt); } }
@@ -1351,20 +1345,17 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,MAJOR (n->rdev), MINOR(n->rdev));if (n->osid !=0 ) { -char *ctx =NULL ; -u32 len;struct lsmblob le; -struct lsmcontext lsmcxt; +struct lsmcontext lsmctx;lsmblob_init (&le, n->osid); -if (security_secid_to_secctx (&le, &ctx, &len)) { +if (security_secid_to_secctx (&le, &lsmctx)) {audit_log_format (ab," osid=%u" , n->osid);if (call_panic) *call_panic =2 ; }else { -audit_log_format (ab," obj=%s" , ctx); -lsmcontext_init (&lsmcxt, ctx, len,0 );/* scaffolding */ -security_release_secctx (&lsmcxt); +audit_log_format (ab," obj=%s" , lsmctx.context); +security_release_secctx (&lsmctx); } }
net/ipv4/ip_sockglue.c +2 -5
@@ -132,20 +132,17 @@ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb) {struct lsmcontext context;struct lsmblob lb; -char *secdata; -u32 seclen;int err; err =security_socket_getpeersec_dgram (NULL , skb, &lb);if (err)return ; - err =security_secid_to_secctx (&lb, &secdata, &seclen); + err =security_secid_to_secctx (&lb, &context);if (err)return ; -put_cmsg (msg,SOL_IP ,SCM_SECURITY , seclen, secdata); -lsmcontext_init (&context, secdata, seclen,0 );/* scaffolding */ +put_cmsg (msg,SOL_IP ,SCM_SECURITY , context.len, context.context);security_release_secctx (&context); }
net/netfilter/nf_conntrack_netlink.c +8 -6
@@ -328,13 +328,12 @@ static int ctnetlink_dump_mark(struct sk_buff *skb, const struct nf_conn *ct)static int ctnetlink_dump_secctx (struct sk_buff *skb,const struct nf_conn *ct) {struct nlattr *nest_secctx; -int len, ret; -char *secctx; +int ret;struct lsmblob le;struct lsmcontext context;lsmblob_init (&le, ct->secmark); - ret =security_secid_to_secctx (&le, &secctx, &len); + ret =security_secid_to_secctx (&le, &context);if (ret)return 0 ;
@@ -343,13 +342,12 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)if (!nest_secctx) goto nla_put_failure; -if (nla_put_string (skb,CTA_SECCTX_NAME , secctx)) +if (nla_put_string (skb,CTA_SECCTX_NAME , context.context)) goto nla_put_failure;nla_nest_end (skb, nest_secctx); ret =0 ; nla_put_failure: -lsmcontext_init (&context, secctx, len,0 );/* scaffolding */ security_release_secctx (&context);return ret; }
@@ -620,12 +618,16 @@ static inline int ctnetlink_secctx_size(const struct nf_conn *ct)#ifdef CONFIG_NF_CONNTRACK_SECMARK int len, ret;struct lsmblob le; +struct lsmcontext context;lsmblob_init (&le, ct->secmark); - ret =security_secid_to_secctx (&le,NULL , &len); + ret =security_secid_to_secctx (&le, &context);if (ret)return 0 ; + len = context.len; +security_release_secctx (&context); +return nla_total_size (0 )/* CTA_SECCTX */ +nla_total_size (sizeof (char ) * len);/* CTA_SECCTX_NAME */ #else
net/netfilter/nf_conntrack_standalone.c +2 -5
@@ -173,19 +173,16 @@ static void ct_seq_stop(struct seq_file *s, void *v)static void ct_show_secctx (struct seq_file *s,const struct nf_conn *ct) {int ret; -u32 len; -char *secctx;struct lsmblob le;struct lsmcontext context;lsmblob_init (&le, ct->secmark); - ret =security_secid_to_secctx (&le, &secctx, &len); + ret =security_secid_to_secctx (&le, &context);if (ret)return ; -seq_printf (s,"secctx=%s " , secctx); +seq_printf (s,"secctx=%s " , context.context); -lsmcontext_init (&context, secctx, len,0 );/* scaffolding */ security_release_secctx (&context); }#else
net/netfilter/nfnetlink_queue.c +4 -1
@@ -310,6 +310,7 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata)u32 seclen =0 ;#if IS_ENABLED (CONFIG_NETWORK_SECMARK )struct lsmblob le; +struct lsmcontext context;if (!skb || !sk_fullsock (skb->sk))return 0 ;
@@ -318,10 +319,12 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata)if (skb->secmark) {lsmblob_init (&le, skb->secmark); -security_secid_to_secctx (&le, secdata, &seclen); +security_secid_to_secctx (&le, &context); + *secdata = context.context; }read_unlock_bh (&skb->sk->sk_callback_lock); + seclen = context.len;#endif return seclen; }
net/netlabel/netlabel_unlabeled.c +12 -28
@@ -388,8 +388,6 @@ int netlbl_unlhsh_add(struct net *net,struct netlbl_unlhsh_iface *iface;struct audit_buffer *audit_buf =NULL ;struct lsmcontext context; -char *secctx =NULL ; -u32 secctx_len;struct lsmblob le; if (addr_len != sizeof(struct in_addr) &&
@@ -454,12 +452,9 @@ int netlbl_unlhsh_add(struct net *net,rcu_read_unlock ();if (audit_buf !=NULL ) {lsmblob_init (&le, secid); -if (security_secid_to_secctx (&le, - &secctx, - &secctx_len) ==0 ) { -audit_log_format (audit_buf," sec_obj=%s" , secctx); -/* scaffolding */ -lsmcontext_init (&context, secctx, secctx_len,0 ); +if (security_secid_to_secctx (&le, &context) ==0 ) { +audit_log_format (audit_buf," sec_obj=%s" , + context.context);security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , ret_val ==0 ?1 :0 );
@@ -492,8 +487,6 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,struct audit_buffer *audit_buf;struct net_device *dev;struct lsmcontext context; -char *secctx; -u32 secctx_len;struct lsmblob le;spin_lock (&netlbl_unlhsh_lock);
@@ -517,11 +510,9 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,if (entry !=NULL )lsmblob_init (&le, entry->secid);if (entry !=NULL && -security_secid_to_secctx (&le, - &secctx, &secctx_len) ==0 ) { -audit_log_format (audit_buf," sec_obj=%s" , secctx); -/* scaffolding */ -lsmcontext_init (&context, secctx, secctx_len,0 ); +security_secid_to_secctx (&le, &context) ==0 ) { +audit_log_format (audit_buf," sec_obj=%s" , + context.context);security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , entry !=NULL ?1 :0 );
@@ -560,8 +551,6 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,struct audit_buffer *audit_buf;struct net_device *dev;struct lsmcontext context; -char *secctx; -u32 secctx_len;struct lsmblob le;spin_lock (&netlbl_unlhsh_lock);
@@ -584,10 +573,9 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,if (entry !=NULL )lsmblob_init (&le, entry->secid);if (entry !=NULL && -security_secid_to_secctx (&le, - &secctx, &secctx_len) ==0 ) { -audit_log_format (audit_buf," sec_obj=%s" , secctx); -lsmcontext_init (&context, secctx, secctx_len,0 ); +security_secid_to_secctx (&le, &context) ==0 ) { +audit_log_format (audit_buf," sec_obj=%s" , + context.context);security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , entry !=NULL ?1 :0 );
@@ -1105,8 +1093,6 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,struct lsmcontext context;void *data;u32 secid; -char *secctx; -u32 secctx_len;struct lsmblob le; data = genlmsg_put(cb_arg->skb, NETLINK_CB(cb_arg->nl_cb->skb).portid,
@@ -1163,15 +1149,13 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, }lsmblob_init (&le, secid); - ret_val =security_secid_to_secctx (&le, &secctx, &secctx_len); + ret_val =security_secid_to_secctx (&le, &context);if (ret_val !=0 ) goto list_cb_failure; ret_val =nla_put (cb_arg->skb,NLBL_UNLABEL_A_SECCTX , - secctx_len, - secctx); -/* scaffolding */ -lsmcontext_init (&context, secctx, secctx_len,0 ); + context.len, + context.context);security_release_secctx (&context);if (ret_val !=0 ) goto list_cb_failure;
net/netlabel/netlabel_user.c +2 -5
@@ -99,8 +99,6 @@ struct audit_buffer *netlbl_audit_start_common(int type, {struct audit_buffer *audit_buf;struct lsmcontext context; -char *secctx; -u32 secctx_len;struct lsmblob le;if (audit_enabled ==AUDIT_OFF )
@@ -116,9 +114,8 @@ struct audit_buffer *netlbl_audit_start_common(int type,lsmblob_init (&le, audit_info->secid);if (audit_info->secid !=0 && -security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) { -audit_log_format (audit_buf," subj=%s" , secctx); -lsmcontext_init (&context, secctx, secctx_len,0 );/*scaffolding*/ +security_secid_to_secctx (&le, &context) ==0 ) { +audit_log_format (audit_buf," subj=%s" , context.context);security_release_secctx (&context); }
security/security.c +5 -4
@@ -457,7 +457,6 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count, hooks[i].head == &security_hook_heads.socket_getpeersec_dgram || hooks[i].head == &security_hook_heads.secctx_to_secid || - hooks[i].head == &security_hook_heads.secid_to_secctx || hooks[i].head == &security_hook_heads.release_secctx || hooks[i].head == &security_hook_heads.ipc_getsecid || hooks[i].head == &security_hook_heads.task_getsecid ||
@@ -2057,15 +2056,17 @@ int security_ismaclabel(const char *name) }EXPORT_SYMBOL (security_ismaclabel); -int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen) +int security_secid_to_secctx (struct lsmblob *l,struct lsmcontext *cp) {int *display = current->security;struct security_hook_list *hp;hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) -if (*display ==LSMDATA_INVALID || *display == hp->slot) +if (*display ==LSMDATA_INVALID || *display == hp->slot) { + cp->slot = hp->slot;return hp->hook.secid_to_secctx (l->secid[hp->slot], - secdata, seclen); + &cp->context, &cp->len); + }return 0 ; }EXPORT_SYMBOL (security_secid_to_secctx);
Signature · 1 line
2.20.1
Re: [PATCH v2 17/25] LSM: Use lsmcontext in security_secid_to_secctx
Quoted 6 lines · Casey Schaufler
Replace the (secctx,seclen) pointer pair with a single lsmcontext pointer to allow return of the LSM identifier along with the context and context length. This allows
security_release_secctx()to know how to release the context. Callers have been modified to use or save the returned data from the new structure.
I like these because they're obviously sensible changes: swap two args for one. :)
-Kees
Quoted 592 lines
Signed-off-by Casey Schaufler <[email protected]>--- drivers/android/binder.c | 24 ++++++--------- include/linux/security.h | 4 +-- include/net/scm.h | 8 ++--- kernel/audit.c | 29 +++++++----------- kernel/auditsc.c | 31 +++++++------------ net/ipv4/ip_sockglue.c | 7 ++--- net/netfilter/nf_conntrack_netlink.c | 14 +++++---- net/netfilter/nf_conntrack_standalone.c | 7 ++--- net/netfilter/nfnetlink_queue.c | 5 +++- net/netlabel/netlabel_unlabeled.c | 40 ++++++++----------------- net/netlabel/netlabel_user.c | 7 ++--- security/security.c | 9 +++--- 12 files changed, 71 insertions(+), 114 deletions(-)drivers/android/binder.c +9
-15@@ -2874,9 +2874,7 @@ static void binder_transaction(struct binder_proc *proc,binder_size_t last_fixup_min_off =0 ;struct binder_context *context = proc->context;int t_debug_id =atomic_inc_return (&binder_last_id); -char *secctx =NULL ; -u32 secctx_sz =0 ; -struct lsmcontext scaff;/* scaffolding */ +struct lsmcontext lsmctx; e =binder_transaction_log_add (&binder_transaction_log); e->debug_id = t_debug_id;@@ -3123,14 +3121,14 @@ static void binder_transaction(struct binder_proc *proc,struct lsmblob le;security_task_getsecid (proc->tsk, &le); - ret =security_secid_to_secctx (&le, &secctx, &secctx_sz); + ret =security_secid_to_secctx (&le, &lsmctx);if (ret) { return_error =BR_FAILED_REPLY ; return_error_param = ret; return_error_line = __LINE__; goto err_get_secctx_failed; } - extra_buffers_size +=ALIGN (secctx_sz,sizeof (u64)); + extra_buffers_size +=ALIGN (lsmctx.len,sizeof (u64)); }trace_binder_transaction (reply, t, target_node);@@ -3149,19 +3147,17 @@ static void binder_transaction(struct binder_proc *proc, t->buffer =NULL ; goto err_binder_alloc_buf_failed; } -if (secctx) { +if (lsmctx.context) {size_t buf_offset =ALIGN (tr->data_size,sizeof (void *)) +ALIGN (tr->offsets_size,sizeof (void *)) +ALIGN (extra_buffers_size,sizeof (void *)) - -ALIGN (secctx_sz,sizeof (u64)); +ALIGN (lsmctx.len,sizeof (u64)); t->security_ctx = (uintptr_t )t->buffer->user_data + buf_offset;binder_alloc_copy_to_buffer (&target_proc->alloc, t->buffer, buf_offset, - secctx, secctx_sz); -lsmcontext_init (&scaff, secctx, secctx_sz,0 ); -security_release_secctx (&scaff); - secctx =NULL ; + lsmctx.context, lsmctx.len); +security_release_secctx (&lsmctx); } t->buffer->debug_id = t->debug_id; t->buffer->transaction = t;@@ -3481,10 +3477,8 @@ static void binder_transaction(struct binder_proc *proc, t->buffer->transaction =NULL ;binder_alloc_free_buf (&target_proc->alloc, t->buffer); err_binder_alloc_buf_failed: -if (secctx) { -lsmcontext_init (&scaff, secctx, secctx_sz,0 ); -security_release_secctx (&scaff); - } +if (lsmctx.context) +security_release_secctx (&lsmctx); err_get_secctx_failed:kfree (tcomplete);binder_stats_deleted (BINDER_STAT_TRANSACTION_COMPLETE );include/linux/security.h +2
-2@@ -475,7 +475,7 @@ int security_setprocattr(const char *lsm, const char *name, void *value, size_t size);int security_netlink_send (struct sock *sk,struct sk_buff *skb);int security_ismaclabel (const char *name); -int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen); +int security_secid_to_secctx (struct lsmblob *l,struct lsmcontext *cp);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *l);void security_release_secctx (struct lsmcontext *cp);@@ -1257,7 +1257,7 @@ static inline int security_ismaclabel(const char *name) }static inline int security_secid_to_secctx (struct lsmblob *l, -char **secdata,u32 *seclen) +struct lsmcontext *cp) {return -EOPNOTSUPP ; }include/net/scm.h +3
-5@@ -93,16 +93,14 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,static inline void scm_passec (struct socket *sock,struct msghdr *msg,struct scm_cookie *scm) {struct lsmcontext context; -char *secdata; -u32 seclen;int err;if (test_bit (SOCK_PASSSEC , &sock->flags)) { - err =security_secid_to_secctx (&scm->lsmblob, &secdata, &seclen); + err =security_secid_to_secctx (&scm->lsmblob, &context);if (!err) { -put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , seclen, secdata); -lsmcontext_init (&context, secdata, seclen,0 );/*scaffolding*/ +put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , + context.len, context.context);security_release_secctx (&context); } }kernel/audit.c +11
-18@@ -1191,9 +1191,8 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)struct audit_buffer *ab;u16 msg_type = nlh->nlmsg_type;struct audit_sig_info *sig_data; -char *ctx =NULL ;u32 len; -struct lsmcontext scaff;/* scaffolding */ +struct lsmcontext context; err =audit_netlink_ok (skb, msg_type);if (err)@@ -1431,25 +1430,22 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)case AUDIT_SIGNAL_INFO : len =0 ;if (lsmblob_is_set (&audit_sig_lsm)) { - err =security_secid_to_secctx (&audit_sig_lsm, &ctx, - &len); + err =security_secid_to_secctx (&audit_sig_lsm, + &context);if (err)return err; } sig_data =kmalloc (sizeof (*sig_data) + len,GFP_KERNEL );if (!sig_data) { -if (lsmblob_is_set (&audit_sig_lsm)) { -lsmcontext_init (&scaff, ctx, len,0 ); -security_release_secctx (&scaff); - } +if (lsmblob_is_set (&audit_sig_lsm)) +security_release_secctx (&context);return -ENOMEM ; } sig_data->uid =from_kuid (&init_user_ns, audit_sig_uid); sig_data->pid = audit_sig_pid;if (lsmblob_is_set (&audit_sig_lsm)) { -memcpy (sig_data->ctx, ctx, len); -lsmcontext_init (&scaff, ctx, len,0 ); -security_release_secctx (&scaff); +memcpy (sig_data->ctx, context.context, context.len); +security_release_secctx (&context); }audit_send_reply (skb, seq,AUDIT_SIGNAL_INFO ,0 ,0 , sig_data,sizeof (*sig_data) + len);@@ -2074,26 +2070,23 @@ void audit_log_key(struct audit_buffer *ab, char *key)int audit_log_task_context (struct audit_buffer *ab) { -char *ctx =NULL ; -unsigned len;int error;struct lsmblob le; -struct lsmcontext scaff;/* scaffolding */ +struct lsmcontext context;security_task_getsecid (current, &le);if (!lsmblob_is_set (&le))return 0 ; - error =security_secid_to_secctx (&le, &ctx, &len); + error =security_secid_to_secctx (&le, &context);if (error) {if (error != -EINVAL ) goto error_path;return 0 ; } -audit_log_format (ab," subj=%s" , ctx); -lsmcontext_init (&scaff, ctx, len,0 ); -security_release_secctx (&scaff); +audit_log_format (ab," subj=%s" , context.context); +security_release_secctx (&context);return 0 ; error_path:kernel/auditsc.c +11
-20@@ -942,9 +942,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, struct lsmblob *l, char *comm) { struct audit_buffer *ab; -struct lsmcontext lsmcxt; -char *ctx =NULL ; -u32 len; +struct lsmcontext lsmctx;int rc =0 ; ab =audit_log_start (context,GFP_KERNEL ,AUDIT_OBJ_PID );@@ -955,13 +953,12 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,from_kuid (&init_user_ns, auid), from_kuid(&init_user_ns, uid), sessionid);if (lsmblob_is_set (l)) { -if (security_secid_to_secctx (l, &ctx, &len)) { +if (security_secid_to_secctx (l, &lsmctx)) {audit_log_format (ab," obj=(none)" ); rc =1 ; }else { -audit_log_format (ab," obj=%s" , ctx); -lsmcontext_init (&lsmcxt, ctx, len,0 );/*scaffolding*/ -security_release_secctx (&lsmcxt); +audit_log_format (ab," obj=%s" , lsmctx.context); +security_release_secctx (&lsmctx); } }audit_log_format (ab," ocomm=" );@@ -1173,7 +1170,6 @@ static void audit_log_fcaps(struct audit_buffer *ab, struct audit_names *name)static void show_special (struct audit_context *context,int *call_panic) { -struct lsmcontext lsmcxt;struct audit_buffer *ab;int i;@@ -1197,16 +1193,14 @@ static void show_special(struct audit_context *context, int *call_panic)from_kgid (&init_user_ns, context->ipc.gid), context->ipc.mode);if (osid) { -char *ctx =NULL ; -u32 len; +struct lsmcontext lsmcxt;struct lsmblob le;lsmblob_init (&le, osid); -if (security_secid_to_secctx (&le, &ctx, &len)) { +if (security_secid_to_secctx (&le, &lsmcxt)) {audit_log_format (ab," osid=%u" , osid); *call_panic =1 ; }else { -audit_log_format (ab," obj=%s" , ctx); -lsmcontext_init (&lsmcxt, ctx, len,0 ); +audit_log_format (ab," obj=%s" , lsmcxt.context);security_release_secctx (&lsmcxt); } }@@ -1351,20 +1345,17 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,MAJOR (n->rdev), MINOR(n->rdev));if (n->osid !=0 ) { -char *ctx =NULL ; -u32 len;struct lsmblob le; -struct lsmcontext lsmcxt; +struct lsmcontext lsmctx;lsmblob_init (&le, n->osid); -if (security_secid_to_secctx (&le, &ctx, &len)) { +if (security_secid_to_secctx (&le, &lsmctx)) {audit_log_format (ab," osid=%u" , n->osid);if (call_panic) *call_panic =2 ; }else { -audit_log_format (ab," obj=%s" , ctx); -lsmcontext_init (&lsmcxt, ctx, len,0 );/* scaffolding */ -security_release_secctx (&lsmcxt); +audit_log_format (ab," obj=%s" , lsmctx.context); +security_release_secctx (&lsmctx); } }net/ipv4/ip_sockglue.c +2
-5@@ -132,20 +132,17 @@ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb) {struct lsmcontext context;struct lsmblob lb; -char *secdata; -u32 seclen;int err; err =security_socket_getpeersec_dgram (NULL , skb, &lb);if (err)return ; - err =security_secid_to_secctx (&lb, &secdata, &seclen); + err =security_secid_to_secctx (&lb, &context);if (err)return ; -put_cmsg (msg,SOL_IP ,SCM_SECURITY , seclen, secdata); -lsmcontext_init (&context, secdata, seclen,0 );/* scaffolding */ +put_cmsg (msg,SOL_IP ,SCM_SECURITY , context.len, context.context);security_release_secctx (&context); }net/netfilter/nf_conntrack_netlink.c +8
-6@@ -328,13 +328,12 @@ static int ctnetlink_dump_mark(struct sk_buff *skb, const struct nf_conn *ct)static int ctnetlink_dump_secctx (struct sk_buff *skb,const struct nf_conn *ct) {struct nlattr *nest_secctx; -int len, ret; -char *secctx; +int ret;struct lsmblob le;struct lsmcontext context;lsmblob_init (&le, ct->secmark); - ret =security_secid_to_secctx (&le, &secctx, &len); + ret =security_secid_to_secctx (&le, &context);if (ret)return 0 ;@@ -343,13 +342,12 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)if (!nest_secctx) goto nla_put_failure; -if (nla_put_string (skb,CTA_SECCTX_NAME , secctx)) +if (nla_put_string (skb,CTA_SECCTX_NAME , context.context)) goto nla_put_failure;nla_nest_end (skb, nest_secctx); ret =0 ; nla_put_failure: -lsmcontext_init (&context, secctx, len,0 );/* scaffolding */ security_release_secctx (&context);return ret; }@@ -620,12 +618,16 @@ static inline int ctnetlink_secctx_size(const struct nf_conn *ct)#ifdef CONFIG_NF_CONNTRACK_SECMARK int len, ret;struct lsmblob le; +struct lsmcontext context;lsmblob_init (&le, ct->secmark); - ret =security_secid_to_secctx (&le,NULL , &len); + ret =security_secid_to_secctx (&le, &context);if (ret)return 0 ; + len = context.len; +security_release_secctx (&context); +return nla_total_size (0 )/* CTA_SECCTX */ +nla_total_size (sizeof (char ) * len);/* CTA_SECCTX_NAME */ #else net/netfilter/nf_conntrack_standalone.c +2
-5@@ -173,19 +173,16 @@ static void ct_seq_stop(struct seq_file *s, void *v)static void ct_show_secctx (struct seq_file *s,const struct nf_conn *ct) {int ret; -u32 len; -char *secctx;struct lsmblob le;struct lsmcontext context;lsmblob_init (&le, ct->secmark); - ret =security_secid_to_secctx (&le, &secctx, &len); + ret =security_secid_to_secctx (&le, &context);if (ret)return ; -seq_printf (s,"secctx=%s " , secctx); +seq_printf (s,"secctx=%s " , context.context); -lsmcontext_init (&context, secctx, len,0 );/* scaffolding */ security_release_secctx (&context); }#else net/netfilter/nfnetlink_queue.c +4
-1@@ -310,6 +310,7 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata)u32 seclen =0 ;#if IS_ENABLED (CONFIG_NETWORK_SECMARK )struct lsmblob le; +struct lsmcontext context;if (!skb || !sk_fullsock (skb->sk))return 0 ;@@ -318,10 +319,12 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata)if (skb->secmark) {lsmblob_init (&le, skb->secmark); -security_secid_to_secctx (&le, secdata, &seclen); +security_secid_to_secctx (&le, &context); + *secdata = context.context; }read_unlock_bh (&skb->sk->sk_callback_lock); + seclen = context.len;#endif return seclen; }net/netlabel/netlabel_unlabeled.c +12
-28@@ -388,8 +388,6 @@ int netlbl_unlhsh_add(struct net *net,struct netlbl_unlhsh_iface *iface;struct audit_buffer *audit_buf =NULL ;struct lsmcontext context; -char *secctx =NULL ; -u32 secctx_len;struct lsmblob le; if (addr_len != sizeof(struct in_addr) &&@@ -454,12 +452,9 @@ int netlbl_unlhsh_add(struct net *net,rcu_read_unlock ();if (audit_buf !=NULL ) {lsmblob_init (&le, secid); -if (security_secid_to_secctx (&le, - &secctx, - &secctx_len) ==0 ) { -audit_log_format (audit_buf," sec_obj=%s" , secctx); -/* scaffolding */ -lsmcontext_init (&context, secctx, secctx_len,0 ); +if (security_secid_to_secctx (&le, &context) ==0 ) { +audit_log_format (audit_buf," sec_obj=%s" , + context.context);security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , ret_val ==0 ?1 :0 );@@ -492,8 +487,6 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,struct audit_buffer *audit_buf;struct net_device *dev;struct lsmcontext context; -char *secctx; -u32 secctx_len;struct lsmblob le;spin_lock (&netlbl_unlhsh_lock);@@ -517,11 +510,9 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,if (entry !=NULL )lsmblob_init (&le, entry->secid);if (entry !=NULL && -security_secid_to_secctx (&le, - &secctx, &secctx_len) ==0 ) { -audit_log_format (audit_buf," sec_obj=%s" , secctx); -/* scaffolding */ -lsmcontext_init (&context, secctx, secctx_len,0 ); +security_secid_to_secctx (&le, &context) ==0 ) { +audit_log_format (audit_buf," sec_obj=%s" , + context.context);security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , entry !=NULL ?1 :0 );@@ -560,8 +551,6 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,struct audit_buffer *audit_buf;struct net_device *dev;struct lsmcontext context; -char *secctx; -u32 secctx_len;struct lsmblob le;spin_lock (&netlbl_unlhsh_lock);@@ -584,10 +573,9 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,if (entry !=NULL )lsmblob_init (&le, entry->secid);if (entry !=NULL && -security_secid_to_secctx (&le, - &secctx, &secctx_len) ==0 ) { -audit_log_format (audit_buf," sec_obj=%s" , secctx); -lsmcontext_init (&context, secctx, secctx_len,0 ); +security_secid_to_secctx (&le, &context) ==0 ) { +audit_log_format (audit_buf," sec_obj=%s" , + context.context);security_release_secctx (&context); }audit_log_format (audit_buf," res=%u" , entry !=NULL ?1 :0 );@@ -1105,8 +1093,6 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,struct lsmcontext context;void *data;u32 secid; -char *secctx; -u32 secctx_len;struct lsmblob le; data = genlmsg_put(cb_arg->skb, NETLINK_CB(cb_arg->nl_cb->skb).portid,@@ -1163,15 +1149,13 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, }lsmblob_init (&le, secid); - ret_val =security_secid_to_secctx (&le, &secctx, &secctx_len); + ret_val =security_secid_to_secctx (&le, &context);if (ret_val !=0 ) goto list_cb_failure; ret_val =nla_put (cb_arg->skb,NLBL_UNLABEL_A_SECCTX , - secctx_len, - secctx); -/* scaffolding */ -lsmcontext_init (&context, secctx, secctx_len,0 ); + context.len, + context.context);security_release_secctx (&context);if (ret_val !=0 ) goto list_cb_failure;net/netlabel/netlabel_user.c +2
-5@@ -99,8 +99,6 @@ struct audit_buffer *netlbl_audit_start_common(int type, {struct audit_buffer *audit_buf;struct lsmcontext context; -char *secctx; -u32 secctx_len;struct lsmblob le;if (audit_enabled ==AUDIT_OFF )@@ -116,9 +114,8 @@ struct audit_buffer *netlbl_audit_start_common(int type,lsmblob_init (&le, audit_info->secid);if (audit_info->secid !=0 && -security_secid_to_secctx (&le, &secctx, &secctx_len) ==0 ) { -audit_log_format (audit_buf," subj=%s" , secctx); -lsmcontext_init (&context, secctx, secctx_len,0 );/*scaffolding*/ +security_secid_to_secctx (&le, &context) ==0 ) { +audit_log_format (audit_buf," subj=%s" , context.context);security_release_secctx (&context); }security/security.c +5
-4@@ -457,7 +457,6 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count, hooks[i].head == &security_hook_heads.socket_getpeersec_dgram || hooks[i].head == &security_hook_heads.secctx_to_secid || - hooks[i].head == &security_hook_heads.secid_to_secctx || hooks[i].head == &security_hook_heads.release_secctx || hooks[i].head == &security_hook_heads.ipc_getsecid || hooks[i].head == &security_hook_heads.task_getsecid ||@@ -2057,15 +2056,17 @@ int security_ismaclabel(const char *name) }EXPORT_SYMBOL (security_ismaclabel); -int security_secid_to_secctx (struct lsmblob *l,char **secdata,u32 *seclen) +int security_secid_to_secctx (struct lsmblob *l,struct lsmcontext *cp) {int *display = current->security;struct security_hook_list *hp;hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) -if (*display ==LSMDATA_INVALID || *display == hp->slot) +if (*display ==LSMDATA_INVALID || *display == hp->slot) { + cp->slot = hp->slot;return hp->hook.secid_to_secctx (l->secid[hp->slot], - secdata, seclen); + &cp->context, &cp->len); + }return 0 ; }EXPORT_SYMBOL (security_secid_to_secctx);Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerPATCH v2 18/25 LSM: Use lsmcontext in security_dentry_init_security
In reply to Casey SchauflerChance the security_dentry_init_security() interface to fill an lsmcontext structure instead of a void * data area and a length. The lone caller of this interface is NFS4, which may make copies of the data using its own mechanisms. A rework of the nfs4 code to use the lsmcontext properly is a significant project, so the coward's way out is taken, and the lsmcontext data from security_dentry_init_security() is copied, then released directly.
--- fs/nfs/nfs4proc.c | 26 ++++++++++++++++---------- include/linux/security.h | 7 +++---- security/security.c | 20 ++++++++++++++++---- 3 files changed, 35 insertions(+), 18 deletions(-)
fs/nfs/nfs4proc.c +16 -10
@@ -113,6 +113,7 @@ static inline struct nfs4_label * nfs4_label_init_security(struct inode *dir, struct dentry *dentry, struct iattr *sattr, struct nfs4_label *label) { + struct lsmcontext context;int err;if (label ==NULL )
@@ -122,21 +123,26 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,return NULL ; err =security_dentry_init_security (dentry, sattr->ia_mode, - &dentry->d_name, (void **)&label->label, &label->len); -if (err ==0 ) -return label; + &dentry->d_name, &context); + +if (err) +return NULL ; + + label->label =kmemdup (context.context, context.len,GFP_KERNEL ); +if (label->label ==NULL ) + label =NULL ; +else + label->len = context.len; + +security_release_secctx (&context); + +return label; -return NULL ; }static inline void nfs4_label_release_security (struct nfs4_label *label) { -struct lsmcontext scaff;/* scaffolding */ - -if (label) { -lsmcontext_init (&scaff, label->label, label->len,0 ); -security_release_secctx (&scaff); - } +kfree (label->label); }static inline u32 *nfs4_bitmask (struct nfs_server *server,struct nfs4_label *label) {
include/linux/security.h +3 -4
@@ -346,8 +346,8 @@ int security_sb_clone_mnt_opts(const struct super_block *oldsb,int security_add_mnt_opt (const char *option,const char *val,int len,void **mnt_opts);int security_dentry_init_security (struct dentry *dentry,int mode, -const struct qstr *name,void **ctx, -u32 *ctxlen); +const struct qstr *name, +struct lsmcontext *ctx); int security_dentry_create_files_as(struct dentry *dentry, int mode, struct qstr *name, const struct cred *old,
@@ -718,8 +718,7 @@ static inline void security_inode_free(struct inode *inode)static inline int security_dentry_init_security (struct dentry *dentry,int mode,const struct qstr *name, -void **ctx, -u32 *ctxlen) +struct lsmcontext *ctx) {return -EOPNOTSUPP ; }
security/security.c +16 -4
@@ -453,6 +453,8 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count,* secid in the lsmblob structure. */ if (hooks[i].head == &security_hook_heads.audit_rule_match || + hooks[i].head == + &security_hook_heads.dentry_init_security || hooks[i].head == &security_hook_heads.kernel_act_as || hooks[i].head == &security_hook_heads.socket_getpeersec_dgram ||
@@ -1030,11 +1032,21 @@ void security_inode_free(struct inode *inode) }int security_dentry_init_security (struct dentry *dentry,int mode, -const struct qstr *name,void **ctx, -u32 *ctxlen) +const struct qstr *name, +struct lsmcontext *cp) { -return call_int_hook (dentry_init_security, -EOPNOTSUPP , dentry, mode, - name, ctx, ctxlen); +int *display = current->security; +struct security_hook_list *hp; + +hlist_for_each_entry (hp, &security_hook_heads.dentry_init_security, + list) +if (*display ==0 || *display == hp->slot) { + cp->slot = hp->slot; +return hp->hook.dentry_init_security (dentry, mode, + name, (void **)&cp->context, &cp->len); + } + +return -EOPNOTSUPP ; }EXPORT_SYMBOL (security_dentry_init_security);
Signature · 1 line
2.20.1
Re: [PATCH v2 18/25] LSM: Use lsmcontext in security_dentry_init_security
Quoted 31 lines · Casey Schaufler
Chance the
security_dentry_init_security()interface to fill an lsmcontext structure instead of a void * data area and a length. The lone caller of this interface is NFS4, which may make copies of the data using its own mechanisms. A rework of the nfs4 code to use the lsmcontext properly is a significant project, so the coward's way out is taken, and the lsmcontext data fromsecurity_dentry_init_security()is copied, then released directly.Signed-off-by Casey Schaufler <[email protected]>--- fs/nfs/nfs4proc.c | 26 ++++++++++++++++---------- include/linux/security.h | 7 +++---- security/security.c | 20 ++++++++++++++++---- 3 files changed, 35 insertions(+), 18 deletions(-)fs/nfs/nfs4proc.c +1
-0@@ -113,6 +113,7 @@ static inline struct nfs4_label * nfs4_label_init_security(struct inode *dir, struct dentry *dentry, struct iattr *sattr, struct nfs4_label *label) { + struct lsmcontext context;int err;if (label ==NULL )@@ -122,21 +123,26 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,return NULL ;
fs/nfs/nfs4proc.c nfs4_label_init_security(struct inode *dir, struct dentry *dentry, · line 131
Quoted 10 lines
fs/nfs/nfs4proc.c +6
-3err =security_dentry_init_security (dentry, sattr->ia_mode, - &dentry->d_name, (void **)&label->label, &label->len); -if (err ==0 ) -return label; + &dentry->d_name, &context); + +if (err) +return NULL ; + + label->label =kmemdup (context.context, context.len,GFP_KERNEL );
I think this is wrong: for NUL-terminated strings, "context.len" isn't currently including the NUL byte (it's set to strlen()).
So, if kmemdup() is used here, it means strlen() isn't correct in the context init helper, it should be using the "size" argument, etc.
Quoted 11 lines
fs/nfs/nfs4proc.c +8
-1+if (label->label ==NULL ) + label =NULL ; +else + label->len = context.len; + +security_release_secctx (&context); + +return label; -return NULL ; }
fs/nfs/nfs4proc.c nfs4_label_init_security(struct inode *dir, struct dentry *dentry, · line 145
Quoted 10 lines
fs/nfs/nfs4proc.c +1
-6static inline void nfs4_label_release_security (struct nfs4_label *label) { -struct lsmcontext scaff;/* scaffolding */ - -if (label) { -lsmcontext_init (&scaff, label->label, label->len,0 ); -security_release_secctx (&scaff); - } +kfree (label->label);
Should label be set to NULL here and len reduced to 0?
Quoted 70 lines
fs/nfs/nfs4proc.c +0
-0}static inline u32 *nfs4_bitmask (struct nfs_server *server,struct nfs4_label *label) {include/linux/security.h +3
-4@@ -346,8 +346,8 @@ int security_sb_clone_mnt_opts(const struct super_block *oldsb,int security_add_mnt_opt (const char *option,const char *val,int len,void **mnt_opts);int security_dentry_init_security (struct dentry *dentry,int mode, -const struct qstr *name,void **ctx, -u32 *ctxlen); +const struct qstr *name, +struct lsmcontext *ctx); int security_dentry_create_files_as(struct dentry *dentry, int mode, struct qstr *name, const struct cred *old,@@ -718,8 +718,7 @@ static inline void security_inode_free(struct inode *inode)static inline int security_dentry_init_security (struct dentry *dentry,int mode,const struct qstr *name, -void **ctx, -u32 *ctxlen) +struct lsmcontext *ctx) {return -EOPNOTSUPP ; }security/security.c +16
-4@@ -453,6 +453,8 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count,* secid in the lsmblob structure. */ if (hooks[i].head == &security_hook_heads.audit_rule_match || + hooks[i].head == + &security_hook_heads.dentry_init_security || hooks[i].head == &security_hook_heads.kernel_act_as || hooks[i].head == &security_hook_heads.socket_getpeersec_dgram ||@@ -1030,11 +1032,21 @@ void security_inode_free(struct inode *inode) }int security_dentry_init_security (struct dentry *dentry,int mode, -const struct qstr *name,void **ctx, -u32 *ctxlen) +const struct qstr *name, +struct lsmcontext *cp) { -return call_int_hook (dentry_init_security, -EOPNOTSUPP , dentry, mode, - name, ctx, ctxlen); +int *display = current->security; +struct security_hook_list *hp; + +hlist_for_each_entry (hp, &security_hook_heads.dentry_init_security, + list) +if (*display ==0 || *display == hp->slot) { + cp->slot = hp->slot; +return hp->hook.dentry_init_security (dentry, mode, + name, (void **)&cp->context, &cp->len); + } + +return -EOPNOTSUPP ; }EXPORT_SYMBOL (security_dentry_init_security);Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerRe: [PATCH v2 18/25] LSM: Use lsmcontext in security_dentry_init_security
Quoted 2 lines · Kees Cook
Quoted 1 line · Casey Schaufler
Chance the
security_dentry_init_security()interface to
Note to self: s/Chance/Change/
Quoted 43 lines
Quoted 30 lines
fill an lsmcontext structure instead of a void * data area and a length. The lone caller of this interface is NFS4, which may make copies of the data using its own mechanisms. A rework of the nfs4 code to use the lsmcontext properly is a significant project, so the coward's way out is taken, and the lsmcontext data from
security_dentry_init_security()is copied, then released directly.Signed-off-by Casey Schaufler <[email protected]>--- fs/nfs/nfs4proc.c | 26 ++++++++++++++++---------- include/linux/security.h | 7 +++---- security/security.c | 20 ++++++++++++++++---- 3 files changed, 35 insertions(+), 18 deletions(-)fs/nfs/nfs4proc.c +1
-0@@ -113,6 +113,7 @@ static inline struct nfs4_label * nfs4_label_init_security(struct inode *dir, struct dentry *dentry, struct iattr *sattr, struct nfs4_label *label) { + struct lsmcontext context;int err;if (label ==NULL )@@ -122,21 +123,26 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry,return NULL ;fs/nfs/nfs4proc.c nfs4_label_init_security(struct inode *dir, struct dentry *dentry, · line 131
Quoted 10 lines
fs/nfs/nfs4proc.c +6
-3err =security_dentry_init_security (dentry, sattr->ia_mode, - &dentry->d_name, (void **)&label->label, &label->len); -if (err ==0 ) -return label; + &dentry->d_name, &context); + +if (err) +return NULL ; + + label->label =kmemdup (context.context, context.len,GFP_KERNEL );I think this is wrong: for NUL-terminated strings, "context.len" isn't currently including the NUL byte (it's set to
strlen()).
Quoted 2 lines
So, if
kmemdup()is used here, it meansstrlen()isn't correct in the context init helper, it should be using the "size" argument, etc.
Would all be true if the context where being set by lsmcontext_init, but it's not. It's coming from the dentry_init_security hook, and the one instance of that, selinux_dentry_init_security() sets the size to strlen() + 1. The kmemdup() will include the terminating NUL.
I too wish that the hooks and their use where more consistent. My sincere hope is that this revision of the infrastructure will help that to some extent.
Quoted 9 lines
Quoted 9 lines
fs/nfs/nfs4proc.c +8
-0+if (label->label ==NULL ) + label =NULL ; +else + label->len = context.len; + +security_release_secctx (&context); + +return label;
Quoted 13 lines
fs/nfs/nfs4proc.c nfs4_label_init_security(struct inode *dir, struct dentry *dentry, · line 145
Quoted 12 lines
fs/nfs/nfs4proc.c +1
-7-return NULL ; }static inline void nfs4_label_release_security (struct nfs4_label *label) { -struct lsmcontext scaff;/* scaffolding */ - -if (label) { -lsmcontext_init (&scaff, label->label, label->len,0 ); -security_release_secctx (&scaff); - } +kfree (label->label);Should label be set to NULL here and len reduced to 0?
It wasn't before, and I'd hate to make too many assumptions about what might be fragile in the NFS code.
Quoted 70 lines
Quoted 70 lines
fs/nfs/nfs4proc.c +0
-0}static inline u32 *nfs4_bitmask (struct nfs_server *server,struct nfs4_label *label) {include/linux/security.h +3
-4@@ -346,8 +346,8 @@ int security_sb_clone_mnt_opts(const struct super_block *oldsb,int security_add_mnt_opt (const char *option,const char *val,int len,void **mnt_opts);int security_dentry_init_security (struct dentry *dentry,int mode, -const struct qstr *name,void **ctx, -u32 *ctxlen); +const struct qstr *name, +struct lsmcontext *ctx); int security_dentry_create_files_as(struct dentry *dentry, int mode, struct qstr *name, const struct cred *old,@@ -718,8 +718,7 @@ static inline void security_inode_free(struct inode *inode)static inline int security_dentry_init_security (struct dentry *dentry,int mode,const struct qstr *name, -void **ctx, -u32 *ctxlen) +struct lsmcontext *ctx) {return -EOPNOTSUPP ; }security/security.c +16
-4@@ -453,6 +453,8 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count,* secid in the lsmblob structure. */ if (hooks[i].head == &security_hook_heads.audit_rule_match || + hooks[i].head == + &security_hook_heads.dentry_init_security || hooks[i].head == &security_hook_heads.kernel_act_as || hooks[i].head == &security_hook_heads.socket_getpeersec_dgram ||@@ -1030,11 +1032,21 @@ void security_inode_free(struct inode *inode) }int security_dentry_init_security (struct dentry *dentry,int mode, -const struct qstr *name,void **ctx, -u32 *ctxlen) +const struct qstr *name, +struct lsmcontext *cp) { -return call_int_hook (dentry_init_security, -EOPNOTSUPP , dentry, mode, - name, ctx, ctxlen); +int *display = current->security; +struct security_hook_list *hp; + +hlist_for_each_entry (hp, &security_hook_heads.dentry_init_security, + list) +if (*display ==0 || *display == hp->slot) { + cp->slot = hp->slot; +return hp->hook.dentry_init_security (dentry, mode, + name, (void **)&cp->context, &cp->len); + } + +return -EOPNOTSUPP ; }EXPORT_SYMBOL (security_dentry_init_security);Signature · 1 line
2.20.1
Re: [PATCH v2 18/25] LSM: Use lsmcontext in security_dentry_init_security
Quoted 11 lines · Casey Schaufler
Quoted 5 lines · Kees Cook
I think this is wrong: for NUL-terminated strings, "context.len" isn't currently including the NUL byte (it's set to
strlen()).So, if
kmemdup()is used here, it meansstrlen()isn't correct in the context init helper, it should be using the "size" argument, etc.Would all be true if the context where being set by
lsmcontext_init, but it's not. It's coming from thedentry_init_securityhook, and the one instance of that,selinux_dentry_init_security()sets the size tostrlen()+ 1. Thekmemdup()will include the terminating NUL.
Ah-ha! Okay, thanks, yes. I see now. Carry on! :)
Quoted 3 lines
I too wish that the hooks and their use where more consistent. My sincere hope is that this revision of the infrastructure will help that to some extent.
Once these changes land it should be much much easier to find ways to refactor for greater sanity. :)
Quoted 4 lines
Quoted 1 line
Should label be set to NULL here and len reduced to 0?
It wasn't before, and I'd hate to make too many assumptions about what might be fragile in the NFS code.
Gotcha.
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerPATCH v2 19/25 LSM: Use lsmcontext in security_inode_getsecctx
In reply to Casey SchauflerChange the security_inode_getsecctx() interface to fill a lsmcontext structure instead of data and length pointers. This provides the information about which LSM created the context so that security_release_secctx() can use the correct hook. A lsmcontext is used within kernfs to store the security information as well.
--- fs/kernfs/dir.c | 8 ++------ fs/kernfs/inode.c | 34 ++++++++++++---------------------- fs/kernfs/kernfs-internal.h | 3 +-- fs/nfsd/nfs4xdr.c | 23 +++++++++-------------- include/linux/security.h | 5 +++-- security/security.c | 13 +++++++++++-- 6 files changed, 38 insertions(+), 48 deletions(-)
fs/kernfs/dir.c +2 -6
@@ -532,12 +532,8 @@ void kernfs_put(struct kernfs_node *kn)kfree_const (kn->name);if (kn->iattr) { -struct lsmcontext scaff;/* scaffolding */ -if (kn->iattr->ia_secdata) { -lsmcontext_init (&scaff, kn->iattr->ia_secdata, - kn->iattr->ia_secdata_len,0 ); -security_release_secctx (&scaff); - } +if (kn->iattr->ia_context.context) +security_release_secctx (&kn->iattr->ia_context);simple_xattrs_free (&kn->iattr->xattrs);kmem_cache_free (kernfs_iattrs_cache, kn->iattr); }
fs/kernfs/inode.c +12 -22
@@ -135,21 +135,14 @@ int kernfs_iop_setattr(struct dentry *dentry, struct iattr *iattr)return error; } -static int kernfs_node_setsecdata (struct kernfs_iattrs *attrs,void **secdata, -u32 *secdata_len) +static void kernfs_node_setsecdata (struct kernfs_iattrs *attrs, +struct lsmcontext *cp) { -void *old_secdata; -size_t old_secdata_len; +struct lsmcontext old_context; - old_secdata = attrs->ia_secdata; - old_secdata_len = attrs->ia_secdata_len; - - attrs->ia_secdata = *secdata; - attrs->ia_secdata_len = *secdata_len; - - *secdata = old_secdata; - *secdata_len = old_secdata_len; -return 0 ; + old_context = attrs->ia_context; + attrs->ia_context = *cp; + *cp = old_context; }ssize_t kernfs_iop_listxattr (struct dentry *dentry,char *buf,size_t size)
@@ -192,8 +185,8 @@ static void kernfs_refresh_inode(struct kernfs_node *kn, struct inode *inode)* persistent copy in kernfs_node. */ set_inode_attr (inode, &attrs->ia_iattr); -security_inode_notifysecctx (inode, attrs->ia_secdata, - attrs->ia_secdata_len); +security_inode_notifysecctx (inode, attrs->ia_context.context, + attrs->ia_context.len); }if (kernfs_type (kn) ==KERNFS_DIR )
@@ -350,8 +343,6 @@ static int kernfs_security_xattr_set(const struct xattr_handler *handler,struct kernfs_node *kn = inode->i_private;struct kernfs_iattrs *attrs;struct lsmcontext context; -void *secdata; -u32 secdata_len =0 ;int error; attrs =kernfs_iattrs (kn);
@@ -361,18 +352,17 @@ static int kernfs_security_xattr_set(const struct xattr_handler *handler, error =security_inode_setsecurity (inode, suffix, value, size, flags);if (error)return error; - error =security_inode_getsecctx (inode, &secdata, &secdata_len); + error =security_inode_getsecctx (inode, &context);if (error)return error;mutex_lock (&kernfs_mutex); - error =kernfs_node_setsecdata (attrs, &secdata, &secdata_len); +kernfs_node_setsecdata (attrs, &context);mutex_unlock (&kernfs_mutex); -if (secdata) { -lsmcontext_init (&context, secdata, secdata_len,0 ); +if (context.context)security_release_secctx (&context); - } +return error; }
fs/kernfs/kernfs-internal.h +1 -2
@@ -21,8 +21,7 @@struct kernfs_iattrs {struct iattr ia_iattr; -void *ia_secdata; -u32 ia_secdata_len; +struct lsmcontext ia_context;struct simple_xattrs xattrs; };
fs/nfsd/nfs4xdr.c +9 -14
@@ -2304,11 +2304,11 @@ nfsd4_encode_layout_types(struct xdr_stream *xdr, u32 layout_types)#ifdef CONFIG_NFSD_V4_SECURITY_LABEL static inline __be32 nfsd4_encode_security_label (struct xdr_stream *xdr,struct svc_rqst *rqstp, -void *context,int len) +struct lsmcontext *context) {__be32 *p; - p =xdr_reserve_space (xdr, len +4 +4 +4 ); + p =xdr_reserve_space (xdr, context->len +4 +4 +4 );if (!p)return nfserr_resource;
@@ -2318,13 +2318,13 @@ nfsd4_encode_security_label(struct xdr_stream *xdr, struct svc_rqst *rqstp,*/ *p++ =cpu_to_be32 (0 );/* lfs */ *p++ =cpu_to_be32 (0 );/* pi */ - p =xdr_encode_opaque (p, context, len); + p =xdr_encode_opaque (p, context->context, context->len); return 0; }#else static inline __be32 nfsd4_encode_security_label (struct xdr_stream *xdr,struct svc_rqst *rqstp, -void *context,int len) +struct lsmcontext *context) {return 0 ; }#endif
@@ -2420,9 +2420,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,__be32 status;int err;struct nfs4_acl *acl =NULL ; -struct lsmcontext scaff;/* scaffolding */ -void *context =NULL ; -int contextlen; +struct lsmcontext context;bool contextsupport = false;struct nfsd4_compoundres *resp = rqstp->rq_resp;u32 minorversion = resp->cstate.minorversion;
@@ -2479,7 +2477,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, bmval0 & FATTR4_WORD0_SUPPORTED_ATTRS) {if (exp->ex_flags &NFSEXP_SECURITY_LABEL ) err =security_inode_getsecctx (d_inode (dentry), - &context, &contextlen); + &context);else err = -EOPNOTSUPP ; contextsupport = (err ==0 );
@@ -2908,8 +2906,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, }if (bmval2 &FATTR4_WORD2_SECURITY_LABEL ) { - status =nfsd4_encode_security_label (xdr, rqstp, context, - contextlen); + status =nfsd4_encode_security_label (xdr, rqstp, &context);if (status) goto out; }
@@ -2920,10 +2917,8 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, out:#ifdef CONFIG_NFSD_V4_SECURITY_LABEL -if (context) { -lsmcontext_init (&scaff, context, contextlen,0 );/*scaffolding*/ -security_release_secctx (&scaff); - } +if (context.context) +security_release_secctx (&context);#endif /* CONFIG_NFSD_V4_SECURITY_LABEL */ kfree (acl);if (tempfh) {
include/linux/security.h +3 -2
@@ -483,7 +483,7 @@ void security_release_secctx(struct lsmcontext *cp);void security_inode_invalidate_secctx (struct inode *inode);int security_inode_notifysecctx (struct inode *inode,void *ctx,u32 ctxlen);int security_inode_setsecctx (struct dentry *dentry,void *ctx,u32 ctxlen); -int security_inode_getsecctx (struct inode *inode,void **ctx,u32 *ctxlen); +int security_inode_getsecctx (struct inode *inode,struct lsmcontext *cp);#else /* CONFIG_SECURITY */ static inline int call_lsm_notifier (enum lsm_event event,void *data)
@@ -1284,7 +1284,8 @@ static inline int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 {return -EOPNOTSUPP ; } -static inline int security_inode_getsecctx (struct inode *inode,void **ctx,u32 *ctxlen) +static inline int security_inode_getsecctx (struct inode *inode, +struct lsmcontext *cp) {return -EOPNOTSUPP ; }
security/security.c +11 -2
@@ -2131,9 +2131,18 @@ int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen) }EXPORT_SYMBOL (security_inode_setsecctx); -int security_inode_getsecctx (struct inode *inode,void **ctx,u32 *ctxlen) +int security_inode_getsecctx (struct inode *inode,struct lsmcontext *cp) { -return call_int_hook (inode_getsecctx, -EOPNOTSUPP , inode, ctx, ctxlen); +int *display = current->security; +struct security_hook_list *hp; + +hlist_for_each_entry (hp, &security_hook_heads.inode_getsecctx, list) +if (*display ==0 || *display == hp->slot) { + cp->slot = hp->slot; +return hp->hook.inode_getsecctx (inode, + (void **)&cp->context, &cp->len); + } +return -EOPNOTSUPP ; }EXPORT_SYMBOL (security_inode_getsecctx);
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 20/25 LSM: security_secid_to_secctx in netlink netfilter
In reply to Casey SchauflerChange netlink netfilter interfaces to use lsmcontext pointers, and remove scaffolding.
--- net/netfilter/nfnetlink_queue.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-)
net/netfilter/nfnetlink_queue.c +13 -19
@@ -305,12 +305,10 @@ static int nfqnl_put_sk_uidgid(struct sk_buff *skb, struct sock *sk)return -1 ; } -static u32 nfqnl_get_sk_secctx (struct sk_buff *skb,char **secdata) +static u32 nfqnl_get_sk_secctx (struct sk_buff *skb,struct lsmcontext *context) { -u32 seclen =0 ;#if IS_ENABLED (CONFIG_NETWORK_SECMARK )struct lsmblob le; -struct lsmcontext context;if (!skb || !sk_fullsock (skb->sk))return 0 ;
@@ -318,15 +316,16 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata)read_lock_bh (&skb->sk->sk_callback_lock);if (skb->secmark) { +/* Any LSM might be looking for the secmark */ lsmblob_init (&le, skb->secmark); -security_secid_to_secctx (&le, &context); - *secdata = context.context; +security_secid_to_secctx (&le, context); }read_unlock_bh (&skb->sk->sk_callback_lock); - seclen = context.len; +return context->len; +#else +return 0 ;#endif -return seclen; }static u32 nfqnl_get_bridge_size (struct nf_queue_entry *entry)
@@ -402,8 +401,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,enum ip_conntrack_info uninitialized_var (ctinfo );struct nfnl_ct_hook *nfnl_ct;bool csum_verify; -struct lsmcontext scaff;/* scaffolding */ -char *secdata =NULL ; +struct lsmcontext context;u32 seclen =0 ; size =nlmsg_total_size (sizeof (struct nfgenmsg ))
@@ -470,7 +468,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, }if ((queue->flags &NFQA_CFG_F_SECCTX ) && entskb->sk) { - seclen =nfqnl_get_sk_secctx (entskb, &secdata); + seclen =nfqnl_get_sk_secctx (entskb, &context);if (seclen) size +=nla_total_size (seclen); }
@@ -605,7 +603,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, nfqnl_put_sk_uidgid(skb, entskb->sk) < 0) goto nla_put_failure; -if (seclen &&nla_put (skb,NFQA_SECCTX , seclen, secdata)) +if (seclen &&nla_put (skb,NFQA_SECCTX , context.len, context.context)) goto nla_put_failure;if (ct && nfnl_ct->build (skb, ct, ctinfo,NFQA_CT ,NFQA_CT_INFO ) <0 )
@@ -633,10 +631,8 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, } nlh->nlmsg_len = skb->len; -if (seclen) { -lsmcontext_init (&scaff, secdata, seclen,0 ); -security_release_secctx (&scaff); - } +if (seclen) +security_release_secctx (&context);return skb; nla_put_failure:
@@ -644,10 +640,8 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,kfree_skb (skb);net_err_ratelimited ("nf_queue: error creating packet message\n" ); nlmsg_failure: -if (seclen) { -lsmcontext_init (&scaff, secdata, seclen,0 ); -security_release_secctx (&scaff); - } +if (seclen) +security_release_secctx (&context);return NULL ; }
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 21/25 Audit: Store LSM audit information in an lsmblob
In reply to Casey SchauflerChange the audit code to store full lsmblob data instead of a single u32 secid. This allows for multiple security modules to use the audit system at the same time. It also allows the removal of scaffolding code that was included during the revision of LSM interfaces.
--- kernel/audit.h | 6 +++--- kernel/auditsc.c | 38 +++++++++++--------------------------- 2 files changed, 14 insertions(+), 30 deletions(-)
kernel/audit.h +3 -3
@@ -91,7 +91,7 @@ struct audit_names {kuid_t uid;kgid_t gid;dev_t rdev; -u32 osid; +struct lsmblob olsm;struct audit_cap_data fcap;unsigned int fcap_ver;unsigned char type;/* record type */
@@ -148,7 +148,7 @@ struct audit_context {kuid_t target_auid;kuid_t target_uid;unsigned int target_sessionid; -struct lsmblob target_lsm; +struct lsmblob target_lsm;char target_comm[TASK_COMM_LEN ];struct audit_tree_refs *trees, *first_trees;
@@ -165,7 +165,7 @@ struct audit_context {kuid_t uid;kgid_t gid;umode_t mode; -u32 osid; +struct lsmblob olsm;int has_perm;uid_t perm_uid;gid_t perm_gid;
kernel/auditsc.c +11 -27
@@ -645,17 +645,15 @@ static int audit_filter_rules(struct task_struct *tsk,if (f->lsm_rule) {/* Find files that match */ if (name) { -lsmblob_init (&le, name->osid); result =security_audit_rule_match ( - &le, + &name->olsm, f->type, f->op, f->lsm_rule); }else if (ctx) {list_for_each_entry (n, &ctx->names_list, list) { -lsmblob_init (&le, n->osid);if (security_audit_rule_match ( - &le, + &n->olsm, f->type, f->op, f->lsm_rule)) {
@@ -667,8 +665,7 @@ static int audit_filter_rules(struct task_struct *tsk,/* Find ipc objects that match */ if (!ctx || ctx->type !=AUDIT_IPC )break ; -lsmblob_init (&le, ctx->ipc.osid); -if (security_audit_rule_match (&le, +if (security_audit_rule_match (&ctx->ipc.olsm, f->type, f->op, f->lsm_rule)) ++result;
@@ -1186,20 +1183,17 @@ static void show_special(struct audit_context *context, int *call_panic) context->socketcall.args[i]);break ; }case AUDIT_IPC : { -u32 osid = context->ipc.osid; +struct lsmblob *olsm = &context->ipc.olsm;audit_log_format (ab,"ouid=%u ogid=%u mode=%#ho" ,from_kuid (&init_user_ns, context->ipc.uid),from_kgid (&init_user_ns, context->ipc.gid), context->ipc.mode); -if (osid) { +if (lsmblob_is_set (olsm)) {struct lsmcontext lsmcxt; -struct lsmblob le; -lsmblob_init (&le, osid); -if (security_secid_to_secctx (&le, &lsmcxt)) { -audit_log_format (ab," osid=%u" , osid); +if (security_secid_to_secctx (olsm, &lsmcxt)) *call_panic =1 ; - }else { +else {audit_log_format (ab," obj=%s" , lsmcxt.context);security_release_secctx (&lsmcxt); }
@@ -1344,13 +1338,10 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,from_kgid (&init_user_ns, n->gid),MAJOR (n->rdev), MINOR(n->rdev)); -if (n->osid !=0 ) { -struct lsmblob le; +if (lsmblob_is_set (&n->olsm)) {struct lsmcontext lsmctx; -lsmblob_init (&le, n->osid); -if (security_secid_to_secctx (&le, &lsmctx)) { -audit_log_format (ab," osid=%u" , n->osid); +if (security_secid_to_secctx (&n->olsm, &lsmctx)) {if (call_panic) *call_panic =2 ; }else {
@@ -1904,17 +1895,13 @@ static inline int audit_copy_fcaps(struct audit_names *name,void audit_copy_inode (struct audit_names *name,const struct dentry *dentry,struct inode *inode,unsigned int flags) { -struct lsmblob le; - name->ino = inode->i_ino; name->dev = inode->i_sb->s_dev; name->mode = inode->i_mode; name->uid = inode->i_uid; name->gid = inode->i_gid; name->rdev = inode->i_rdev; -security_inode_getsecid (inode, &le); -/* scaffolding until osid is updated */ - name->osid = le.secid[1 ]; +security_inode_getsecid (inode, &name->olsm);if (flags &AUDIT_INODE_NOEVAL ) { name->fcap_ver =-1 ;return ;
@@ -2264,14 +2251,11 @@ void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)void __audit_ipc_obj (struct kern_ipc_perm *ipcp) {struct audit_context *context =audit_context (); -struct lsmblob le; context->ipc.uid = ipcp->uid; context->ipc.gid = ipcp->gid; context->ipc.mode = ipcp->mode; context->ipc.has_perm =0 ; -security_ipc_getsecid (ipcp, &le); -/* scaffolding on the [1] - change "osid" to a lsmblob */ - context->ipc.osid = le.secid[1 ]; +security_ipc_getsecid (ipcp, &context->ipc.olsm); context->type =AUDIT_IPC ; }
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 22/25 LSM: Return the lsmblob slot on initialization
In reply to Casey SchauflerReturn the slot allocated to the calling LSM in the lsmblob structure. This can be used to set lsmblobs explicitly for netlabel interfaces.
--- include/linux/lsm_hooks.h | 4 ++-- security/apparmor/lsm.c | 8 ++++++-- security/security.c | 9 +++++++-- security/selinux/hooks.c | 5 ++++- security/smack/smack_lsm.c | 5 ++++- 5 files changed, 23 insertions(+), 8 deletions(-)
include/linux/lsm_hooks.h +2 -2
@@ -2068,8 +2068,8 @@ struct lsm_blob_sizes {extern struct security_hook_heads security_hook_heads;extern char *lsm_names; -extern void security_add_hooks (struct security_hook_list *hooks,int count, -char *lsm); +extern int security_add_hooks (struct security_hook_list *hooks,int count, +char *lsm);#define LSM_FLAG_LEGACY_MAJOR BIT(0)#define LSM_FLAG_EXCLUSIVE BIT(1)
security/apparmor/lsm.c +6 -2
@@ -47,6 +47,9 @@/* Flag indicating whether initialization completed */ int apparmor_initialized; +/* Slot for the AppArmor secid in the lsmblob structure */ +int apparmor_lsmblob_slot; + DEFINE_PER_CPU(struct aa_buffers, aa_buffers);
@@ -1678,8 +1681,9 @@ static int __init apparmor_init(void)aa_free_root_ns (); goto buffers_out; } -security_add_hooks (apparmor_hooks,ARRAY_SIZE (apparmor_hooks), -"apparmor" ); + apparmor_lsmblob_slot =security_add_hooks (apparmor_hooks, +ARRAY_SIZE (apparmor_hooks), +"apparmor" );/* Report that AppArmor successfully initialized */ apparmor_initialized =1 ;
security/security.c +7 -2
@@ -437,9 +437,12 @@ static int lsm_slot __initdata;* Each LSM has to register its hooks with the infrastructure. * If the LSM is using hooks that export secids allocate a slot * for it in the lsmblob. +* +* Returns the slot number in the lsmblob structure if one is +* allocated or LSMDATA_INVALID if one was not allocated. */ -void __init security_add_hooks (struct security_hook_list *hooks,int count, -char *lsm) +int __init security_add_hooks (struct security_hook_list *hooks,int count, +char *lsm) {int slot =LSMDATA_INVALID ;int i;
@@ -474,6 +477,8 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count, }if (lsm_append (lsm, &lsm_names) <0 )panic ("%s - Cannot get early memory.\n" , __func__); + +return slot; }int call_lsm_notifier (enum lsm_event event,void *data)
security/selinux/hooks.c +4 -1
@@ -103,6 +103,7 @@#include "avc_ss.h" struct selinux_state selinux_state; +int selinux_lsmblob_slot;/* SECMARK reference count */ static atomic_t selinux_secmark_refcount =ATOMIC_INIT (0 );
@@ -6877,7 +6878,9 @@ static __init int selinux_init(void)hashtab_cache_init (); -security_add_hooks (selinux_hooks,ARRAY_SIZE (selinux_hooks),"selinux" ); + selinux_lsmblob_slot =security_add_hooks (selinux_hooks, +ARRAY_SIZE (selinux_hooks), +"selinux" );if (avc_add_callback (selinux_netcache_avc_callback,AVC_CALLBACK_RESET ))panic ("SELinux: Unable to register AVC netcache callback\n" );
security/smack/smack_lsm.c +4 -1
@@ -60,6 +60,7 @@ static LIST_HEAD(smk_ipv6_port_list);#endif static struct kmem_cache *smack_inode_cache;int smack_enabled; +int smack_lsmblob_slot;#define A (s) {"smack"#s, sizeof("smack"#s) - 1, Opt_##s} static struct {
@@ -4749,7 +4750,9 @@ static __init int smack_init(void)/* * Register with LSM */ -security_add_hooks (smack_hooks,ARRAY_SIZE (smack_hooks),"smack" ); + smack_lsmblob_slot =security_add_hooks (smack_hooks, +ARRAY_SIZE (smack_hooks), +"smack" ); smack_enabled =1 ;pr_info ("Smack: Initializing.\n" );
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 23/25 NET: Store LSM netlabel data in a lsmblob
In reply to Casey SchauflerNetlabel uses LSM interfaces requiring an lsmblob and the internal storage is used to pass information between these interfaces, so change the internal data from a secid to a lsmblob. Update the netlabel interfaces and their callers to accomodate the change.
--- include/net/netlabel.h | 8 ++-- net/ipv4/cipso_ipv4.c | 6 ++- net/netlabel/netlabel_kapi.c | 6 +-- net/netlabel/netlabel_unlabeled.c | 57 +++++++++++------------------ net/netlabel/netlabel_unlabeled.h | 2 +- security/selinux/include/security.h | 1 + security/selinux/netlabel.c | 2 +- security/selinux/ss/services.c | 4 +- security/smack/smack.h | 1 + security/smack/smack_lsm.c | 3 +- security/smack/smackfs.c | 10 +++-- 11 files changed, 48 insertions(+), 52 deletions(-)
include/net/netlabel.h +4 -4
@@ -180,7 +180,7 @@ struct netlbl_lsm_catmap {* @attr.mls: MLS sensitivity label * @attr.mls.cat: MLS category bitmap * @attr.mls.lvl: MLS sensitivity level -* @attr.secid: LSM specific secid token +* @attr.lsmblob: LSM specific data * * Description: * This structure is used to pass security attributes between NetLabel and the
@@ -215,7 +215,7 @@ struct netlbl_lsm_secattr {struct netlbl_lsm_catmap *cat;u32 lvl; } mls; -u32 secid; +struct lsmblob lsmblob; } attr; };
@@ -429,7 +429,7 @@ int netlbl_cfg_unlbl_static_add(struct net *net,const void *addr, const void *mask, u16 family, - u32 secid, + struct lsmblob *lsmblob, struct netlbl_audit *audit_info); int netlbl_cfg_unlbl_static_del(struct net *net, const char *dev_name,
@@ -537,7 +537,7 @@ static inline int netlbl_cfg_unlbl_static_add(struct net *net,const void *addr, const void *mask, u16 family, - u32 secid, + struct lsmblob *lsmblob, struct netlbl_audit *audit_info) { return -ENOSYS;
net/ipv4/cipso_ipv4.c +4 -2
@@ -1481,7 +1481,8 @@ static int cipso_v4_gentag_loc(const struct cipso_v4_doi *doi_def, buffer[0 ] =CIPSO_V4_TAG_LOCAL ; buffer[1 ] =CIPSO_V4_TAG_LOC_BLEN ; - *(u32 *)&buffer[2 ] = secattr->attr.secid; +/* only one netlabel user - the first */ + *(u32 *)&buffer[2 ] = secattr->attr.lsmblob.secid[1 ];return CIPSO_V4_TAG_LOC_BLEN ; }
@@ -1501,7 +1502,8 @@ static int cipso_v4_parsetag_loc(const struct cipso_v4_doi *doi_def,const unsigned char *tag, struct netlbl_lsm_secattr *secattr) { - secattr->attr.secid = *(u32 *)&tag[2]; +/* only one netlabel user - the first */ + secattr->attr.lsmblob.secid[1] = *(u32 *)&tag[2]; secattr->flags |=NETLBL_SECATTR_SECID ;return 0 ;
net/netlabel/netlabel_kapi.c +3 -3
@@ -210,7 +210,7 @@ int netlbl_cfg_unlbl_map_add(const char *domain,* @addr: IP address in network byte order (struct in[6]_addr) * @mask: address mask in network byte order (struct in[6]_addr) * @family: address family -* @secid: LSM secid value for the entry +* @lsmblob: LSM data value for the entry * @audit_info: NetLabel audit information * * Description:
@@ -224,7 +224,7 @@ int netlbl_cfg_unlbl_static_add(struct net *net,const void *addr, const void *mask, u16 family, - u32 secid, + struct lsmblob *lsmblob, struct netlbl_audit *audit_info) { u32 addr_len;
@@ -244,7 +244,7 @@ int netlbl_cfg_unlbl_static_add(struct net *net,return netlbl_unlhsh_add (net, dev_name, addr, mask, addr_len, - secid, audit_info); + lsmblob, audit_info); }/**
net/netlabel/netlabel_unlabeled.c +22 -35
207 lines not on this page · raw message
net/netlabel/netlabel_unlabeled.h +1 -1
@@ -225,7 +225,7 @@ int netlbl_unlhsh_add(struct net *net,const void *addr, const void *mask, u32 addr_len, - u32 secid, + struct lsmblob *lsmblob, struct netlbl_audit *audit_info); int netlbl_unlhsh_remove(struct net *net, const char *dev_name,
security/selinux/include/security.h +1 -0
@@ -68,6 +68,7 @@struct netlbl_lsm_secattr ;extern int selinux_enabled; +extern int selinux_lsmblob_slot;/* Policy capabilities */ enum {
security/selinux/netlabel.c +1 -1
@@ -122,7 +122,7 @@ static struct netlbl_lsm_secattr *selinux_netlbl_sock_getattr(return NULL ;if ((secattr->flags &NETLBL_SECATTR_SECID ) && - (secattr->attr.secid == sid)) + (secattr->attr.lsmblob.secid[selinux_lsmblob_slot] == sid))return secattr;return NULL ;
security/selinux/ss/services.c +2 -2
@@ -3593,7 +3593,7 @@ int security_netlbl_secattr_to_sid(struct selinux_state *state,if (secattr->flags &NETLBL_SECATTR_CACHE ) *sid = *(u32 *)secattr->cache->data;else if (secattr->flags &NETLBL_SECATTR_SECID ) - *sid = secattr->attr.secid; + *sid = secattr->attr.lsmblob.secid[selinux_lsmblob_slot];else if (secattr->flags &NETLBL_SECATTR_MLS_LVL ) { rc = -EIDRM ; ctx =sidtab_search (sidtab,SECINITSID_NETMSG );
@@ -3666,7 +3666,7 @@ int security_netlbl_sid_to_secattr(struct selinux_state *state,if (secattr->domain ==NULL ) goto out; - secattr->attr.secid = sid; + secattr->attr.lsmblob.secid[selinux_lsmblob_slot] = sid; secattr->flags |=NETLBL_SECATTR_DOMAIN_CPY |NETLBL_SECATTR_SECID ;mls_export_netlbl_lvl (policydb, ctx, secattr); rc =mls_export_netlbl_cat (policydb, ctx, secattr);
security/smack/smack.h +1 -0
@@ -320,6 +320,7 @@ void smk_destroy_label_list(struct list_head *list);* Shared data. */ extern int smack_enabled; +extern int smack_lsmblob_slot;extern int smack_cipso_direct;extern int smack_cipso_mapped;extern struct smack_known *smack_net_ambient;
security/smack/smack_lsm.c +2 -1
@@ -3742,7 +3742,8 @@ static struct smack_known *smack_from_secattr(struct netlbl_lsm_secattr *sap,/* * Looks like a fallback, which gives us a secid. */ -return smack_from_secid (sap->attr.secid); +return smack_from_secid ( + sap->attr.lsmblob.secid[smack_lsmblob_slot]);/* * Without guidance regarding the smack value * for the packet fall back on the network
security/smack/smackfs.c +7 -3
@@ -1150,6 +1150,7 @@ static void smk_net4addr_insert(struct smk_net4addr *new)static ssize_t smk_write_net4addr (struct file *file,const char __user *buf,size_t count,loff_t *ppos) { +struct lsmblob lsmblob;struct smk_net4addr *snp;struct sockaddr_in newname;char *smack;
@@ -1281,10 +1282,13 @@ static ssize_t smk_write_net4addr(struct file *file, const char __user *buf,* this host so that incoming packets get labeled. * but only if we didn't get the special CIPSO option */ -if (rc ==0 && skp !=NULL ) +if (rc ==0 && skp !=NULL ) { +lsmblob_init (&lsmblob,0 ); + lsmblob.secid[smack_lsmblob_slot] = snp->smk_label->smk_secid; rc =netlbl_cfg_unlbl_static_add (&init_net,NULL , - &snp->smk_host, &snp->smk_mask,PF_INET , - snp->smk_label->smk_secid, &audit_info); + &snp->smk_host, &snp->smk_mask,PF_INET , &lsmblob, + &audit_info); + }if (rc ==0 ) rc = count;
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 24/25 Fix slotted list and getpeersec_d
In reply to Casey Schaufler--- security/security.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
security/security.c +5 -1
@@ -461,6 +461,8 @@ int __init security_add_hooks(struct security_hook_list *hooks, int count, hooks[i].head == &security_hook_heads.kernel_act_as || hooks[i].head == &security_hook_heads.socket_getpeersec_dgram || + hooks[i].head == &security_hook_heads.getprocattr || + hooks[i].head == &security_hook_heads.setprocattr || hooks[i].head == &security_hook_heads.secctx_to_secid || hooks[i].head == &security_hook_heads.release_secctx || hooks[i].head == &security_hook_heads.ipc_getsecid ||
@@ -2269,7 +2271,9 @@ int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, list) { rc = hp->hook.socket_getpeersec_dgram (sock, skb, &l->secid[hp->slot]); -if (rc !=0 ) +if (rc == -ENOPROTOOPT ) + rc =0 ; +else if (rc !=0 )break ; }return rc;
Signature · 1 line
2.20.1
Re: [PATCH v2 24/25] Fix slotted list and getpeersec_d
Quoted 1 line · Casey Schaufler
Signed-off-by Casey Schaufler <[email protected]>
Was this supposed to be folded into patch 4?
-Kees
Quoted 31 lines
--- security/security.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)security/security.c +5
-1@@ -461,6 +461,8 @@ int __init security_add_hooks(struct security_hook_list *hooks, int count, hooks[i].head == &security_hook_heads.kernel_act_as || hooks[i].head == &security_hook_heads.socket_getpeersec_dgram || + hooks[i].head == &security_hook_heads.getprocattr || + hooks[i].head == &security_hook_heads.setprocattr || hooks[i].head == &security_hook_heads.secctx_to_secid || hooks[i].head == &security_hook_heads.release_secctx || hooks[i].head == &security_hook_heads.ipc_getsecid ||@@ -2269,7 +2271,9 @@ int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, list) { rc = hp->hook.socket_getpeersec_dgram (sock, skb, &l->secid[hp->slot]); -if (rc !=0 ) +if (rc == -ENOPROTOOPT ) + rc =0 ; +else if (rc !=0 )break ; }return rc;Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerRe: [PATCH v2 24/25] Fix slotted list and getpeersec_d
Quoted 3 lines · Kees Cook
Quoted 1 line · Casey Schaufler
Signed-off-by Casey Schaufler <[email protected]>Was this supposed to be folded into patch 4?
The first hunk, yes. I'll do that in the next revision.
The second hunk I'm still debating whether this is the right change, or whether the AppArmor socket_getpeersec_dgram stub hook should just be deleted.
Quoted 33 lines
-Kees
Quoted 31 lines
--- security/security.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)security/security.c +5
-1@@ -461,6 +461,8 @@ int __init security_add_hooks(struct security_hook_list *hooks, int count, hooks[i].head == &security_hook_heads.kernel_act_as || hooks[i].head == &security_hook_heads.socket_getpeersec_dgram || + hooks[i].head == &security_hook_heads.getprocattr || + hooks[i].head == &security_hook_heads.setprocattr || hooks[i].head == &security_hook_heads.secctx_to_secid || hooks[i].head == &security_hook_heads.release_secctx || hooks[i].head == &security_hook_heads.ipc_getsecid ||@@ -2269,7 +2271,9 @@ int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, list) { rc = hp->hook.socket_getpeersec_dgram (sock, skb, &l->secid[hp->slot]); -if (rc !=0 ) +if (rc == -ENOPROTOOPT ) + rc =0 ; +else if (rc !=0 )break ; }return rc;Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v2 25/25 AppArmor: Remove the exclusive flag
In reply to Casey SchauflerWith the inclusion of the "display" process attribute mechanism AppArmor no longer needs to be treated as an "exclusive" security module. Remove the flag that indicates it is exclusive.
--- security/apparmor/lsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/apparmor/lsm.c +1 -1
@@ -1709,7 +1709,7 @@ static int __init apparmor_init(void)DEFINE_LSM (apparmor) = { .name ="apparmor" , - .flags =LSM_FLAG_LEGACY_MAJOR |LSM_FLAG_EXCLUSIVE , + .flags =LSM_FLAG_LEGACY_MAJOR , .enabled = &apparmor_enabled, .blobs = &apparmor_blob_sizes, .init = apparmor_init,
Signature · 1 line
2.20.1
Quoted 3 lines · Casey Schaufler
Patches 0001-0003 complete the process of moving managment of security blobs that might be shared from the individual modules to the infrastructure.
I think these are happy stand-alone patches and should just go into the common LSM tree for v5.3.
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerQuoted 6 lines · Kees Cook
Quoted 3 lines · Casey Schaufler
Patches 0001-0003 complete the process of moving managment of security blobs that might be shared from the individual modules to the infrastructure.
I think these are happy stand-alone patches and should just go into the common LSM tree for v5.3.
They don't have a user without the rest of the patchset, but they do make the internals more consistent. James' call.
James Morris
maintainerQuoted 7 lines · Kees Cook
Quoted 3 lines · Casey Schaufler
Patches 0001-0003 complete the process of moving managment of security blobs that might be shared from the individual modules to the infrastructure.
I think these are happy stand-alone patches and should just go into the common LSM tree for v5.3.
We extended stacking support in March to allow Landlock and SARA to be merged and have not seen anything from them since.
Is there any point in adding more of the same for v5.3 before the current AppArmor stacking changes are fully ready? This seems to carry risk but no concrete benefit for the release.
Signature · 2 lines
James Morris <[email protected]>
Stacked LSMs (was Re: [PATCH v2 00/25] LSM: Module stacking for AppArmor)
Quoted 2 lines · James Morris
We extended stacking support in March to allow Landlock and SARA to be merged and have not seen anything from them since.
Salvatore and Mickaël, have you had a chance to look at the stacking changes? I'd love to see work progress on your LSMs now that the stacking prerequisites have landed.
Thanks!
Signature · 1 line
Kees Cook
Re: Stacked LSMs (was Re: [PATCH v2 00/25] LSM: Module stacking for AppArmor)
Quoted 10 lines · Kees Cook
Quoted 1 line · James Morris
We extended stacking support in March to allow Landlock and SARA to
be
Quoted 1 line
merged and have not seen anything from them since.
Salvatore and Mickaël, have you had a chance to look at the stacking changes? I'd love to see work progress on your LSMs now that the stacking prerequisites have landed.
Thanks!
Yes, I successfully updated Landlock as a stackable LSM. I also worked on removing some code (and related features, for now) to get smaller patches for the next round, and I tried to get rid of the VFS modifications. I still need to update the tests, rebase a last time and review everything before sending a new patch set, hopefully next week.
Mickaël
Quoted 10 lines · Casey Schaufler
Patches 0004-0014 replace system use of a "secid" with a structure "lsmblob" containing information from the security modules to be held and reused later. At this point lsmblob contains an array of u32 secids, one "slot" for each of the security modules compiled into the kernel that used secids. A "slot" is allocated when a security module registers a hook for one of the interfaces that uses a secid or a security context. The infrastructure is changed to use the slot number to pass the correct secid to or from the security module hooks.
I found 14/25 in your git tree. Very satisfying to see all the scaffolding vanish for process_measurement() :)
I like this progression in 4-14; I find it much much easier to review. My only complaint is the variable names. I think I'd prefer "blob" over "le" or "l", which are both contain very little information about what they are.
Signature · 1 line
Kees Cook
Casey Schaufler
maintainerQuoted 11 lines · Kees Cook
Quoted 10 lines · Casey Schaufler
Patches 0004-0014 replace system use of a "secid" with a structure "lsmblob" containing information from the security modules to be held and reused later. At this point lsmblob contains an array of u32 secids, one "slot" for each of the security modules compiled into the kernel that used secids. A "slot" is allocated when a security module registers a hook for one of the interfaces that uses a secid or a security context. The infrastructure is changed to use the slot number to pass the correct secid to or from the security module hooks.
Quoted 7 lines
I found 14/25 in your git tree. Very satisfying to see all the scaffolding vanish for
process_measurement():)I like this progression in 4-14; I find it much much easier to review. My only complaint is the variable names. I think I'd prefer "blob" over "le" or "l", which are both contain very little information about what they are.
I know what they are! OK, I get it. Using "blob" would make it more obvious. It's an relatively easy change, so I'll incorporate it going forward.