LSM: Module stacking for AppArmor
Subsystems (26)
A message that is not in the archive (sent off-list or not yet received): [email protected]
Casey Schaufler
maintainerv11 cover LSM: Module stacking for AppArmor
Reposting relevant patches to netdev.
This patchset provides the changes required for the AppArmor security module to stack safely with any other.
v11: Rebase to 5.4-rc6
Incorporate feedback from v10
- Disambiguate reading /proc/.../attr/display by restricting all use of the interface to the current process.
- Fix a merge error in AppArmor's display attribute check
v10: Ask the security modules if the display can be changed.
v9: There is no version 9
v8: Incorporate feedback from v7
- Minor clean-up in display value management
- refactor "compound" context creation to use a common append_ctx() function.
v7: Incorporate feedback from v6
- Make setting the display a privileged operation. The availability of compound contexts reduces the need for setting the display.
v6: Incorporate feedback from v5
- Add subj_<lsm>= and obj_<lsm>= fields to audit records
- Add /proc/.../attr/context to get the full context in lsmname\0value\0... format as suggested by Simon McVittie
- Add SO_PEERCONTEXT for getsockopt() to get the full context in the same format, also suggested by Simon McVittie.
- Add /sys/kernel/security/lsm_display_default to provide the display default value.
v5: Incorporate feedback from v4
- Initialize the lsmcontext in security_secid_to_secctx()
- Clear the lsmcontext in all security_release_secctx() cases
- Don't use the "display" on strictly internal context interfaces.
- The SELinux binder hooks check for cases where the context "display" isn't compatible with SELinux.
v4: Incorporate feedback from v3
- Mark new lsm_<blob>_alloc functions static
- Replace the lsm and slot fields of the security_hook_list with a pointer to a LSM allocated lsm_id structure. The LSM identifies if it needs a slot explicitly. Use the lsm_id rather than make security_add_hooks return the slot value.
- Validate slot values used in security.c
- Reworked the "display" process attribute handling so that it works right and doesn't use goofy list processing.
- fix display value check in dentry_init_security
- Replace audit_log of secids with '?' instead of deleting the audit log
v3: Incorporate feedback from v2
- Make lsmblob parameter and variable names more meaningful, changing "le" and "l" to "blob".
- Improve consistency of constant naming.
- Do more sanity checking during LSM initialization.
- Be a bit clearer about what is temporary scaffolding.
- Rather than clutter security_getpeersec_dgram with otherwise unnecessary checks remove the apparmor stub, which does nothing useful.
Patche 0001 moves management of the sock security blob from the individual modules to the infrastructure.
Patches 0002-0012 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 requests one.
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 0013 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/self/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. Setting the display requires that all modules using the /proc interfaces allow the transition. The "display" of other processess can be neither read nor written. All suggested cases for reading the display of a different process have race conditions.
Patch 0014 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 0015-0017 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.
The Netlabel code is converted to save lsmblob structures instead of secids in Patches 0018-0019.
Patch 0020 adds checks to the binder hooks which verify that if both ends of a transaction use the same "display".
Patches 0021-0022 add addition data to the audit records to identify the LSM specific data for all active modules.
Patches 0023-0024 add new interfaces for getting the compound security contexts.
Finally, with all interference on the AppArmor hooks removed, Patch 0025 removes the exclusive bit from AppArmor. An unnecessary stub hook was also removed.
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". The sockperf and dbench results are on the order of 0.2% to 0.8% difference, with better performance being as common as worse. The benchmarks were run with AppArmor and Smack on Ubuntu.
https://github.com/cschaufler/lsm-stacking.git#stack-5.4-rc6-v11-apparmor
--- arch/alpha/include/uapi/asm/socket.h | 1 + arch/mips/include/uapi/asm/socket.h | 1 + arch/parisc/include/uapi/asm/socket.h | 1 + arch/sparc/include/uapi/asm/socket.h | 1 + drivers/android/binder.c | 26 +- fs/ceph/xattr.c | 6 +- fs/nfs/nfs4proc.c | 22 +- fs/nfsd/nfs4xdr.c | 20 +- fs/proc/base.c | 2 + include/linux/audit.h | 1 + include/linux/cred.h | 3 +- include/linux/lsm_hooks.h | 37 +- include/linux/security.h | 175 ++++++++-- include/net/af_unix.h | 2 +- include/net/netlabel.h | 8 +- include/net/scm.h | 15 +- include/uapi/asm-generic/socket.h | 1 + kernel/audit.c | 72 +++- kernel/audit.h | 9 +- kernel/audit_fsnotify.c | 1 + kernel/auditfilter.c | 10 +- kernel/auditsc.c | 127 ++++--- kernel/cred.c | 12 +- net/core/sock.c | 7 +- 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 | 5 +- net/netlabel/netlabel_kapi.c | 6 +- net/netlabel/netlabel_unlabeled.c | 97 +++--- net/netlabel/netlabel_unlabeled.h | 2 +- net/netlabel/netlabel_user.c | 13 +- net/netlabel/netlabel_user.h | 6 +- net/unix/af_unix.c | 6 +- net/xfrm/xfrm_policy.c | 2 + net/xfrm/xfrm_state.c | 2 + security/apparmor/include/apparmor.h | 3 +- security/apparmor/include/net.h | 6 +- security/apparmor/lsm.c | 117 +++---- security/commoncap.c | 7 +- security/integrity/ima/ima.h | 15 +- security/integrity/ima/ima_api.c | 11 +- security/integrity/ima/ima_appraise.c | 6 +- security/integrity/ima/ima_main.c | 49 +-- security/integrity/ima/ima_policy.c | 19 +- security/integrity/integrity_audit.c | 1 + security/loadpin/loadpin.c | 8 +- security/safesetid/lsm.c | 8 +- security/security.c | 593 +++++++++++++++++++++++++++++--- security/selinux/hooks.c | 109 +++--- security/selinux/include/classmap.h | 2 +- security/selinux/include/objsec.h | 5 + security/selinux/include/security.h | 1 + security/selinux/netlabel.c | 25 +- security/selinux/ss/services.c | 4 +- security/smack/smack.h | 6 + security/smack/smack_lsm.c | 124 ++++--- security/smack/smack_netfilter.c | 8 +- security/smack/smackfs.c | 10 +- security/tomoyo/tomoyo.c | 8 +- security/yama/yama_lsm.c | 7 +- 64 files changed, 1376 insertions(+), 563 deletions(-)
Casey Schaufler
maintainerPATCH v11 1/25 LSM: Infrastructure management of the sock security
Move 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
@@ -2080,6 +2080,7 @@ struct lsm_blob_sizes {int lbs_cred;int lbs_file;int lbs_inode; +int lbs_sock;int lbs_ipc;int lbs_msg_msg;int lbs_task;
security/apparmor/include/net.h +5 -1
@@ -51,7 +51,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
@@ -753,33 +753,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); }/**
@@ -788,8 +770,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);
@@ -840,7 +822,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);
@@ -1025,7 +1007,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 ;
@@ -1038,7 +1020,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;
@@ -1122,7 +1104,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 ();
@@ -1132,7 +1114,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 ;
@@ -1149,6 +1131,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 = {
@@ -1185,7 +1168,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),
@@ -1624,7 +1606,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
@@ -28,6 +28,7 @@#include <linux/string.h> #include <linux/msg.h> #include <net/flow.h> +#include <net/sock.h> #define MAX_LSM_EVM_XATTR 2
@@ -169,6 +170,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_task, &blob_sizes.lbs_task); }
@@ -304,6 +306,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 ("task blob size = %d\n" , blob_sizes.lbs_task);/*
@@ -622,6 +625,28 @@ static int lsm_msg_msg_alloc(struct msg_msg *mp)return 0 ; } +/** +* 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. +*/ +static 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_early_task - during initialization allocate a composite task blob * @task: the task that needs a blob
@@ -2066,12 +2091,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
@@ -185,4 +185,9 @@ static inline u32 current_sid(void) return tsec->sid; } +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
@@ -17,6 +17,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>
@@ -67,7 +68,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 )
@@ -100,7 +101,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 )
@@ -235,7 +236,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 ;
@@ -273,7 +274,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_in addr4;struct sockaddr_in6 addr6;
@@ -352,7 +353,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 ;
@@ -370,8 +371,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; }
@@ -389,7 +390,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 )
@@ -504,7 +505,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) &&
@@ -542,7 +543,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
@@ -581,7 +582,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
@@ -372,6 +372,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; +} +/* * Is the directory transmuting? */
security/smack/smack_lsm.c +30 -34
225 lines not on this page · raw message
security/smack/smack_netfilter.c +4 -4
@@ -28,8 +28,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; }
@@ -46,8 +46,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 v11 5/25 net: Prepare UDS for security 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 | 18 +++++++++++++++--- 6 files changed, 34 insertions(+), 15 deletions(-)
include/linux/security.h +5 -2
@@ -1354,7 +1354,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 *blob);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);
@@ -1492,7 +1493,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 *blob) {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 0 for now */ + err =security_secid_to_secctx (scm->lsmblob.secid[0 ], + &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 0 */ + err =security_secid_to_secctx (lb.secid[0 ], &secdata, &seclen);if (err)return ;
net/unix/af_unix.c +3 -3
@@ -138,17 +138,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 +15 -3
@@ -2108,10 +2108,22 @@ 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 *blob) { -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) { +if (WARN_ON (hp->lsmid->slot <0 || hp->lsmid->slot >= lsm_slot)) +continue ; + rc = hp->hook.socket_getpeersec_dgram (sock, skb, + &blob->secid[hp->lsmid->slot]); +if (rc !=0 ) +break ; + } +return rc; }EXPORT_SYMBOL (security_socket_getpeersec_dgram);
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v11 6/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 | 5 ++++- net/netlabel/netlabel_unlabeled.c | 14 ++++++++------ security/security.c | 18 +++++++++++++++--- 6 files changed, 37 insertions(+), 22 deletions(-)
include/linux/security.h +3 -2
@@ -494,7 +494,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 *blob);void security_release_secctx (char *secdata,u32 seclen);void security_inode_invalidate_secctx (struct inode *inode);int security_inode_notifysecctx (struct inode *inode,void *ctx,u32 ctxlen);
@@ -1300,7 +1301,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 *blob) {return -EOPNOTSUPP ; }
kernel/cred.c +1 -3
@@ -756,14 +756,12 @@ EXPORT_SYMBOL(set_security_override);int set_security_override_from_ctx (struct cred *new,const char *secctx) {struct lsmblob blob; -u32 secid;int ret; - ret =security_secctx_to_secid (secctx,strlen (secctx), &secid); + ret =security_secctx_to_secid (secctx,strlen (secctx), &blob);if (ret <0 )return ret; -lsmblob_init (&blob, secid);return set_security_override (new, &blob); }EXPORT_SYMBOL (set_security_override_from_ctx);
net/netfilter/nft_meta.c +6 -7
@@ -617,21 +617,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 blob;int err; - err =security_secctx_to_secid (priv->ctx,strlen (priv->ctx), &tmp_secid); + err =security_secctx_to_secid (priv->ctx,strlen (priv->ctx), &blob);if (err)return err; -if (!tmp_secid) -return -ENOENT ; - - err =security_secmark_relabel_packet (tmp_secid); +/* Using le[0] is scaffolding */ + err =security_secmark_relabel_packet (blob.secid[0 ]);if (err)return err; - priv->secid = tmp_secid; +/* Using le[0] is scaffolding */ + priv->secid = blob.secid[0 ];return 0 ; }
net/netfilter/xt_SECMARK.c +4 -1
@@ -45,13 +45,14 @@ secmark_tg(struct sk_buff *skb, const struct xt_action_param *par)static int checkentry_lsm (struct xt_secmark_target_info *info) { +struct lsmblob blob;int err; info->secctx[SECMARK_SECCTX_MAX -1 ] ='\0' ; info->secid =0 ; err =security_secctx_to_secid (info->secctx,strlen (info->secctx), - &info->secid); + &blob);if (err) {if (err == -EINVAL ) pr_info_ratelimited("invalid security context \'%s\'\n",
@@ -59,6 +60,8 @@ static int checkentry_lsm(struct xt_secmark_target_info *info)return err; } +/* scaffolding during the transition */ + info->secid = blob.secid[0 ];if (!info->secid) {pr_info_ratelimited ("unable to map security context \'%s\'\n" , info->secctx);
net/netlabel/netlabel_unlabeled.c +8 -6
@@ -881,7 +881,7 @@ static int netlbl_unlabel_staticadd(struct sk_buff *skb,void *addr;void *mask;u32 addr_len; -u32 secid; +struct lsmblob blob;struct netlbl_audit audit_info;/* Don't allow users to add both IPv4 and IPv6 addresses for a
@@ -905,12 +905,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); + &blob);if (ret_val !=0 )return ret_val; +/* scaffolding with the [0] */ return netlbl_unlhsh_add (&init_net, - dev_name, addr, mask, addr_len, secid, + dev_name, addr, mask, addr_len, blob.secid[0 ], &audit_info); }
@@ -932,7 +933,7 @@ static int netlbl_unlabel_staticadddef(struct sk_buff *skb,void *addr;void *mask;u32 addr_len; -u32 secid; +struct lsmblob blob;struct netlbl_audit audit_info;/* Don't allow users to add both IPv4 and IPv6 addresses for a
@@ -954,12 +955,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); + &blob);if (ret_val !=0 )return ret_val; +/* scaffolding with the [0] */ return netlbl_unlhsh_add (&init_net, -NULL , addr, mask, addr_len, secid, +NULL , addr, mask, addr_len, blob.secid[0 ], &audit_info); }
security/security.c +15 -3
@@ -1970,10 +1970,22 @@ 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 *blob) { - *secid =0 ; -return call_int_hook (secctx_to_secid,0 , secdata, seclen, secid); +struct security_hook_list *hp; +int rc; + +lsmblob_init (blob,0 ); +hlist_for_each_entry (hp, &security_hook_heads.secctx_to_secid, list) { +if (WARN_ON (hp->lsmid->slot <0 || hp->lsmid->slot >= lsm_slot)) +continue ; + rc = hp->hook.secctx_to_secid (secdata, seclen, + &blob->secid[hp->lsmid->slot]); +if (rc !=0 ) +return rc; + } +return 0 ; }EXPORT_SYMBOL (security_secctx_to_secid);
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v11 7/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 be 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 | 5 ++--- kernel/audit.c | 9 +++++++-- kernel/auditsc.c | 14 ++++++++++---- 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 | 16 +++++++++++++--- 12 files changed, 71 insertions(+), 29 deletions(-)
drivers/android/binder.c +3 -1
@@ -3109,10 +3109,12 @@ static void binder_transaction(struct binder_proc *proc,if (target_node && target_node->txn_security_ctx) {u32 secid; +struct lsmblob blob;size_t added_size;security_task_getsecid (proc->tsk, &secid); - ret =security_secid_to_secctx (secid, &secctx, &secctx_sz); +lsmblob_init (&blob, secid); + ret =security_secid_to_secctx (&blob, &secctx, &secctx_sz);if (ret) { return_error =BR_FAILED_REPLY ; return_error_param = ret;
include/linux/security.h +3 -2
@@ -493,7 +493,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 *blob,char **secdata,u32 *seclen);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *blob);void security_release_secctx (char *secdata,u32 seclen);
@@ -1294,7 +1294,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 *blob, +char **secdata,u32 *seclen) {return -EOPNOTSUPP ; }
include/net/scm.h +2 -3
@@ -97,9 +97,8 @@ 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 0 for now */ - err =security_secid_to_secctx (scm->lsmblob.secid[0 ], - &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
@@ -1417,7 +1417,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 blob; + +lsmblob_init (&blob, audit_sig_sid); + err =security_secid_to_secctx (&blob, &ctx, &len);if (err)return err; }
@@ -2060,12 +2063,14 @@ int audit_log_task_context(struct audit_buffer *ab)unsigned len;int error;u32 sid; +struct lsmblob blob;security_task_getsecid (current, &sid);if (!sid)return 0 ; - error =security_secid_to_secctx (sid, &ctx, &len); +lsmblob_init (&blob, sid); + error =security_secid_to_secctx (&blob, &ctx, &len);if (error) {if (error != -EINVAL ) goto error_path;
kernel/auditsc.c +10 -4
@@ -966,6 +966,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,char *ctx =NULL ;u32 len;int rc =0 ; +struct lsmblob blob; ab =audit_log_start (context,GFP_KERNEL ,AUDIT_OBJ_PID );if (!ab)
@@ -975,7 +976,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 (&blob, sid); +if (security_secid_to_secctx (&blob, &ctx, &len)) {audit_log_format (ab," obj=(none)" ); rc =1 ; }else {
@@ -1218,7 +1220,10 @@ 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 blob; + +lsmblob_init (&blob, osid); +if (security_secid_to_secctx (&blob, &ctx, &len)) {audit_log_format (ab," osid=%u" , osid); *call_panic =1 ; }else {
@@ -1368,9 +1373,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 blob; -if (security_secid_to_secctx ( - n->osid, &ctx, &len)) { +lsmblob_init (&blob, n->osid); +if (security_secid_to_secctx (&blob, &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 0 */ - err =security_secid_to_secctx (lb.secid[0 ], &secdata, &seclen); + err =security_secid_to_secctx (&lb, &secdata, &seclen);if (err)return ;
net/netfilter/nf_conntrack_netlink.c +6 -2
@@ -331,8 +331,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 blob; - ret =security_secid_to_secctx (ct->secmark, &secctx, &len); +lsmblob_init (&blob, ct->secmark); + ret =security_secid_to_secctx (&blob, &secctx, &len);if (ret)return 0 ;
@@ -621,8 +623,10 @@ static inline int ctnetlink_secctx_size(const struct nf_conn *ct) {#ifdef CONFIG_NF_CONNTRACK_SECMARK int len, ret; +struct lsmblob blob; - ret =security_secid_to_secctx (ct->secmark,NULL , &len); +lsmblob_init (&blob, ct->secmark); + ret =security_secid_to_secctx (&blob,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 blob; - ret =security_secid_to_secctx (ct->secmark, &secctx, &len); +lsmblob_init (&blob, ct->secmark); + ret =security_secid_to_secctx (&blob, &secctx, &len);if (ret)return ;
net/netfilter/nfnetlink_queue.c +6 -2
@@ -305,13 +305,17 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata) {u32 seclen =0 ;#if IS_ENABLED (CONFIG_NETWORK_SECMARK ) +struct lsmblob blob; +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 (&blob, skb->secmark); +security_secid_to_secctx (&blob, secdata, &seclen); + }read_unlock_bh (&skb->sk->sk_callback_lock);#endif
net/netlabel/netlabel_unlabeled.c +14 -4
@@ -375,6 +375,7 @@ int netlbl_unlhsh_add(struct net *net,struct audit_buffer *audit_buf =NULL ;char *secctx =NULL ;u32 secctx_len; +struct lsmblob blob;if (addr_len !=sizeof (struct in_addr ) && addr_len !=sizeof (struct in6_addr ))
@@ -437,7 +438,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 (&blob, secid); +if (security_secid_to_secctx (&blob, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , secctx);
@@ -474,6 +476,7 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,struct net_device *dev;char *secctx;u32 secctx_len; +struct lsmblob blob;spin_lock (&netlbl_unlhsh_lock); list_entry = netlbl_af4list_remove(addr->s_addr, mask->s_addr,
@@ -493,8 +496,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 (&blob, entry->secid);if (entry !=NULL && -security_secid_to_secctx (entry->secid, +security_secid_to_secctx (&blob, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , secctx);security_release_secctx (secctx, secctx_len);
@@ -536,6 +541,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,struct net_device *dev;char *secctx;u32 secctx_len; +struct lsmblob blob;spin_lock (&netlbl_unlhsh_lock); list_entry =netlbl_af6list_remove (addr, mask, &iface->addr6_list);
@@ -554,8 +560,10 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, addr, mask);if (dev !=NULL )dev_put (dev); +if (entry !=NULL ) +lsmblob_init (&blob, entry->secid);if (entry !=NULL && -security_secid_to_secctx (entry->secid, +security_secid_to_secctx (&blob, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , secctx);security_release_secctx (secctx, secctx_len);
@@ -1076,6 +1084,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,u32 secid;char *secctx;u32 secctx_len; +struct lsmblob blob; data = genlmsg_put(cb_arg->skb, NETLINK_CB(cb_arg->nl_cb->skb).portid, cb_arg->seq, &netlbl_unlabel_gnl_family,
@@ -1130,7 +1139,8 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, secid = addr6->secid; } - ret_val =security_secid_to_secctx (secid, &secctx, &secctx_len); +lsmblob_init (&blob, secid); + ret_val =security_secid_to_secctx (&blob, &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
@@ -86,6 +86,7 @@ struct audit_buffer *netlbl_audit_start_common(int type,struct audit_buffer *audit_buf;char *secctx;u32 secctx_len; +struct lsmblob blob;if (audit_enabled ==AUDIT_OFF )return NULL ;
@@ -98,10 +99,9 @@ struct audit_buffer *netlbl_audit_start_common(int type,from_kuid (&init_user_ns, audit_info->loginuid), audit_info->sessionid); +lsmblob_init (&blob, audit_info->secid);if (audit_info->secid !=0 && -security_secid_to_secctx (audit_info->secid, - &secctx, - &secctx_len) ==0 ) { +security_secid_to_secctx (&blob, &secctx, &secctx_len) ==0 ) {audit_log_format (audit_buf," subj=%s" , secctx);security_release_secctx (secctx, secctx_len); }
security/security.c +13 -3
@@ -1963,10 +1963,20 @@ 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 *blob,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) { +if (WARN_ON (hp->lsmid->slot <0 || hp->lsmid->slot >= lsm_slot)) +continue ; + rc = hp->hook.secid_to_secctx (blob->secid[hp->lsmid->slot], + secdata, seclen); +if (rc !=0 ) +return rc; + } +return 0 ; }EXPORT_SYMBOL (security_secid_to_secctx);
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v11 9/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 | 11 ++++---- kernel/auditfilter.c | 4 +-- kernel/auditsc.c | 18 ++++++++----- 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 | 39 ++++++++++++++++----------- security/security.c | 12 ++++++--- 10 files changed, 68 insertions(+), 42 deletions(-)
drivers/android/binder.c +1 -3
@@ -3108,12 +3108,10 @@ 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 blob;size_t added_size; -security_task_getsecid (proc->tsk, &secid); -lsmblob_init (&blob, secid); +security_task_getsecid (proc->tsk, &blob); ret =security_secid_to_secctx (&blob, &secctx, &secctx_sz);if (ret) { return_error =BR_FAILED_REPLY ;
include/linux/security.h +4 -3
@@ -447,7 +447,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 *blob);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);
@@ -1099,9 +1099,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 *blob) { - *secid =0 ; +lsmblob_init (blob,0 ); }static inline int security_task_setnice (struct task_struct *p,int nice)
kernel/audit.c +6 -5
@@ -2062,14 +2062,12 @@ int audit_log_task_context(struct audit_buffer *ab)char *ctx =NULL ;unsigned len;int error; -u32 sid;struct lsmblob blob; -security_task_getsecid (current, &sid); -if (!sid) +security_task_getsecid (current, &blob); +if (!lsmblob_is_set (&blob))return 0 ; -lsmblob_init (&blob, sid); error =security_secid_to_secctx (&blob, &ctx, &len);if (error) {if (error != -EINVAL )
@@ -2276,6 +2274,7 @@ int audit_set_loginuid(kuid_t loginuid)int audit_signal_info (int sig,struct task_struct *t) {kuid_t uid =current_uid (), auid; +struct lsmblob blob; if (auditd_test_task(t) && (sig == SIGTERM || sig == SIGHUP ||
@@ -2286,7 +2285,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, &blob); +/* scaffolding until audit_sig_sid is converted */ + audit_sig_sid = blob.secid[0 ]; }return audit_signal_info_syscall (t);
kernel/auditfilter.c +1 -3
@@ -1324,7 +1324,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 blob;switch (f->type) {
@@ -1355,8 +1354,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 (&blob, sid); +security_task_getsecid (current, &blob); result =security_audit_rule_match ( &blob, f->type, f->op, f->lsm_rule);
kernel/auditsc.c +12 -6
@@ -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 blob;unsigned int sessionid;
@@ -641,10 +640,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, &blob); need_sid =0 ; } -lsmblob_init (&blob, sid); result = security_audit_rule_match(&blob, f->type, f->op,
@@ -2382,12 +2380,15 @@ int __audit_sockaddr(int len, void *a)void __audit_ptrace (struct task_struct *t) {struct audit_context *context =audit_context (); +struct lsmblob blob; 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, &blob); +/* scaffolding - until target_sid is converted */ + context->target_sid = blob.secid[0 ];memcpy (context->target_comm, t->comm,TASK_COMM_LEN ); }
@@ -2403,6 +2404,7 @@ int audit_signal_info_syscall(struct task_struct *t)struct audit_aux_data_pids *axp;struct audit_context *ctx =audit_context ();kuid_t t_uid =task_uid (t); +struct lsmblob blob;if (!audit_signals ||audit_dummy_context ())return 0 ;
@@ -2414,7 +2416,9 @@ int audit_signal_info_syscall(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, &blob); +/* scaffolding until target_sid is converted */ + ctx->target_sid = blob.secid[0 ];memcpy (ctx->target_comm, t->comm,TASK_COMM_LEN );return 0 ; }
@@ -2435,7 +2439,9 @@ int audit_signal_info_syscall(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, &blob); +/* scaffolding until target_sid is converted */ + axp->target_sid[axp->pid_count] = blob.secid[0 ];memcpy (axp->target_comm[axp->pid_count], t->comm,TASK_COMM_LEN ); axp->pid_count++;
net/netlabel/netlabel_unlabeled.c +4 -1
@@ -1539,11 +1539,14 @@ int __init netlbl_unlabel_defconf(void)int ret_val;struct netlbl_dom_map *entry;struct netlbl_audit audit_info; +struct lsmblob blob;/* 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, &blob); +/* scaffolding until audit_info.secid is converted */ + audit_info.secid = blob.secid[0 ]; audit_info.loginuid =GLOBAL_ROOT_UID ; audit_info.sessionid =0 ;
net/netlabel/netlabel_user.h +5 -1
@@ -34,7 +34,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 blob; + +security_task_getsecid (current, &blob); +/* scaffolding until secid is converted */ + audit_info->secid = blob.secid[0 ]; audit_info->loginuid =audit_get_loginuid (current); audit_info->sessionid =audit_get_sessionid (current); }
security/integrity/ima/ima_appraise.c +3 -1
@@ -48,11 +48,13 @@ bool is_ima_appraise_enabled(void)int ima_must_appraise (struct inode *inode,int mask,enum ima_hooks func) {u32 secid; +struct lsmblob blob;if (!ima_appraise)return 0 ; -security_task_getsecid (current, &secid); +security_task_getsecid (current, &blob); +lsmblob_secid (&blob, &secid);return ima_match_policy (inode,current_cred (), secid, func, mask,IMA_APPRAISE |IMA_HASH ,NULL ,NULL ); }
security/integrity/ima/ima_main.c +23 -16
@@ -380,12 +380,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 blob;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, &blob); +/* scaffolding - until process_measurement changes */ +return process_measurement (file,current_cred (), blob.secid[0 ], +NULL ,0 ,MAY_EXEC ,MMAP_CHECK ); }return 0 ;
@@ -408,10 +409,12 @@ int ima_bprm_check(struct linux_binprm *bprm) {int ret;u32 secid; +struct lsmblob blob; -security_task_getsecid (current, &secid); - ret =process_measurement (bprm->file,current_cred (), secid,NULL ,0 , -MAY_EXEC ,BPRM_CHECK ); +security_task_getsecid (current, &blob); +/* scaffolding until process_measurement changes */ + ret =process_measurement (bprm->file,current_cred (), blob.secid[0 ], +NULL ,0 ,MAY_EXEC ,BPRM_CHECK );if (ret)return ret;
@@ -432,10 +435,11 @@ int ima_bprm_check(struct linux_binprm *bprm)*/ int ima_file_check (struct file *file,int mask) { -u32 secid; +struct lsmblob blob; -security_task_getsecid (current, &secid); -return process_measurement (file,current_cred (), secid,NULL ,0 , +security_task_getsecid (current, &blob); +/* scaffolding until process_measurement changes */ +return process_measurement (file,current_cred (), blob.secid[0 ],NULL ,0 , mask & (MAY_READ |MAY_WRITE |MAY_EXEC |MAY_APPEND ),FILE_CHECK ); }
@@ -544,7 +548,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 blob;if (!file && read_id ==READING_FIRMWARE ) { if ((ima_appraise & IMA_APPRAISE_FIRMWARE) &&
@@ -566,9 +570,10 @@ 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, -MAY_READ , func); +security_task_getsecid (current, &blob); +/* scaffolding until process_measurement changes */ +return process_measurement (file,current_cred (), blob.secid[0 ], buf, + size,MAY_READ , func); }/**
@@ -687,11 +692,13 @@ static void process_buffer_measurement(const void *buf, int size,void ima_kexec_cmdline (const void *buf,int size) {u32 secid; +struct lsmblob blob;if (buf && size !=0 ) { -security_task_getsecid (current, &secid); +security_task_getsecid (current, &blob); +/* scaffolding */ process_buffer_measurement (buf, size,"kexec-cmdline" , -current_cred (), secid); +current_cred (), blob.secid[0 ]); } }
security/security.c +9 -3
@@ -1700,10 +1700,16 @@ 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 *blob) { - *secid =0 ; -call_void_hook (task_getsecid, p, secid); +struct security_hook_list *hp; + +lsmblob_init (blob,0 ); +hlist_for_each_entry (hp, &security_hook_heads.task_getsecid, list) { +if (WARN_ON (hp->lsmid->slot <0 || hp->lsmid->slot >= lsm_slot)) +continue ; + hp->hook.task_getsecid (p, &blob->secid[hp->lsmid->slot]); + } }EXPORT_SYMBOL (security_task_getsecid);
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v11 13/25 LSM: Specify which LSM to display
In reply to Casey SchauflerCreate a new entry "display" in the procfs attr directory for controlling which LSM security information is displayed for a process. A process can only read or write its own display value.
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. A helper function lsm_task_display() is provided to get the display slot for a task_struct.
Setting the "display" requires that all security modules using setprocattr hooks allow the action. Each security module is responsible for defining its policy.
AppArmor hook provided by John Johansen <[email protected]> SELinux hook provided by Stephen Smalley <[email protected]>
--- fs/proc/base.c | 1 + include/linux/lsm_hooks.h | 15 +++ security/apparmor/include/apparmor.h | 3 +- security/apparmor/lsm.c | 32 +++++ security/security.c | 169 ++++++++++++++++++++++++--- security/selinux/hooks.c | 11 ++ security/selinux/include/classmap.h | 2 +- security/smack/smack_lsm.c | 7 ++ 8 files changed, 221 insertions(+), 19 deletions(-)
fs/proc/base.c +1 -0
@@ -2652,6 +2652,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),
include/linux/lsm_hooks.h +15 -0
@@ -2171,4 +2171,19 @@ static inline void security_delete_hooks(struct security_hook_list *hooks,extern int lsm_inode_alloc (struct inode *inode); +/** +* lsm_task_display - the "display" LSM for this task +* @task: The task to report on +* +* Returns the task's display LSM slot. +*/ +static inline int lsm_task_display (struct task_struct *task) +{ +int *display = task->security; + +if (display) +return *display; +return LSMBLOB_INVALID ; +} +#endif /* ! __LINUX_LSM_HOOKS_H */
security/apparmor/include/apparmor.h +2 -1
@@ -28,8 +28,9 @@#define AA_CLASS_SIGNAL 10#define AA_CLASS_NET 14#define AA_CLASS_LABEL 16 +#define AA_CLASS_DISPLAY_LSM 17 -#define AA_CLASS_LAST AA_CLASS_LABEL +#define AA_CLASS_LAST AA_CLASS_DISPLAY_LSM/* Control parameters settable through module/boot flags */ extern enum audit_mode aa_g_audit;
security/apparmor/lsm.c +32 -0
@@ -599,6 +599,25 @@ static int apparmor_getprocattr(struct task_struct *task, char *name,return error; } + +static int profile_display_lsm (struct aa_profile *profile, +struct common_audit_data *sa) +{ +struct aa_perms perms = { }; +unsigned int state; + + state =PROFILE_MEDIATES (profile,AA_CLASS_DISPLAY_LSM ); +if (state) { +aa_compute_perms (profile->policy.dfa, state, &perms); +aa_apply_modes_to_perms (profile, &perms); +aad (sa)->label = &profile->label; + +return aa_check_perms (profile, &perms,AA_MAY_WRITE , sa,NULL ); + } + +return 0 ; +} +static int apparmor_setprocattr (const char *name,void *value,size_t size) {
@@ -610,6 +629,19 @@ static int apparmor_setprocattr(const char *name, void *value,if (size ==0 )return -EINVAL ; +/* LSM infrastructure does actual setting of display if allowed */ +if (!strcmp (name,"display" )) { +struct aa_profile *profile; +struct aa_label *label; + +aad (&sa)->info ="set display lsm" ; + label =begin_current_label_crit_section (); + error =fn_for_each_confined (label, profile, +profile_display_lsm (profile, &sa)); +end_current_label_crit_section (label); +return error; + } +/* AppArmor requires that the buffer must be null terminated atm */ if (args[size -1 ] !='\0' ) {/* null terminate */
security/security.c +152 -17
274 lines not on this page · raw message
security/selinux/hooks.c +11 -0
@@ -6315,6 +6315,17 @@ static int selinux_setprocattr(const char *name, void *value, size_t size)/* * Basic control over ability to set these attributes at all. */ + +/* +* For setting display, we only perform a permission check; +* the actual update to the display value is handled by the +* LSM framework. +*/ +if (!strcmp (name,"display" )) +return avc_has_perm (&selinux_state, + mysid, mysid,SECCLASS_PROCESS2 , +PROCESS2__SETDISPLAY ,NULL ); +if (!strcmp (name,"exec" )) error = avc_has_perm(&selinux_state, mysid, mysid, SECCLASS_PROCESS,
security/selinux/include/classmap.h +1 -1
@@ -52,7 +52,7 @@ struct security_class_mapping secclass_map[] = {"execmem" ,"execstack" ,"execheap" ,"setkeycreate" , "setsockcreate", "getrlimit", NULL } }, {"process2" , - { "nnp_transition", "nosuid_transition", NULL } }, + { "nnp_transition", "nosuid_transition", "setdisplay", NULL } }, {"system" , { "ipc_info", "syslog_read", "syslog_mod", "syslog_console", "module_request", "module_load", NULL } },
security/smack/smack_lsm.c +7 -0
@@ -3519,6 +3519,13 @@ static int smack_setprocattr(const char *name, void *value, size_t size)struct smack_known_list_elem *sklep;int rc; +/* +* Allow the /proc/.../attr/current and SO_PEERSEC "display" +* to be reset at will. +*/ +if (strcmp (name,"display" ) ==0 ) +return 0 ; +if (!smack_privileged (CAP_MAC_ADMIN ) &&list_empty (&tsp->smk_relabel))return -EPERM ;
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v11 14/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.
--- drivers/android/binder.c | 10 +++++-- fs/ceph/xattr.c | 6 +++- fs/nfs/nfs4proc.c | 8 +++-- fs/nfsd/nfs4xdr.c | 7 +++-- include/linux/security.h | 39 +++++++++++++++++++++++-- include/net/scm.h | 5 +++- 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 | 18 ++++++++---- security/smack/smack_lsm.c | 14 ++++++--- 16 files changed, 141 insertions(+), 40 deletions(-)
drivers/android/binder.c +7 -3
@@ -2865,6 +2865,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;
@@ -3161,7 +3162,8 @@ static void binder_transaction(struct binder_proc *proc, t->security_ctx =0 ;WARN_ON (1 ); } -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;
@@ -3494,8 +3496,10 @@ static void binder_transaction(struct binder_proc *proc,binder_alloc_free_buf (&target_proc->alloc, t->buffer); err_binder_alloc_buf_failed: err_bad_extra_size: -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/ceph/xattr.c +5 -1
@@ -1271,12 +1271,16 @@ int ceph_security_init_secctx(struct dentry *dentry, umode_t mode,void ceph_release_acl_sec_ctx (struct ceph_acl_sec_ctx *as_ctx) { +#ifdef CONFIG_CEPH_FS_SECURITY_LABEL +struct lsmcontext scaff;/* scaffolding */ +#endif #ifdef CONFIG_CEPH_FS_POSIX_ACL posix_acl_release (as_ctx->acl);posix_acl_release (as_ctx->default_acl);#endif #ifdef CONFIG_CEPH_FS_SECURITY_LABEL -security_release_secctx (as_ctx->sec_ctx, as_ctx->sec_ctxlen); +lsmcontext_init (&scaff, as_ctx->sec_ctx, as_ctx->sec_ctxlen,0 ); +security_release_secctx (&scaff);#endif if (as_ctx->pagelist)ceph_pagelist_release (as_ctx->pagelist);
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
@@ -2421,6 +2421,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,int err;struct nfs4_acl *acl =NULL ;#ifdef CONFIG_NFSD_V4_SECURITY_LABEL +struct lsmcontext scaff;/* scaffolding */ void *context =NULL ;int contextlen;#endif
@@ -2923,8 +2924,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 +37 -2
@@ -126,6 +126,41 @@ enum lockdown_reason { LOCKDOWN_CONFIDENTIALITY_MAX, }; +/* +* 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. +* This is a scaffolding function that will be removed when +* lsmcontext integration is complete. +*/ +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 *
@@ -496,7 +531,7 @@ int security_ismaclabel(const char *name);int security_secid_to_secctx (struct lsmblob *blob,char **secdata,u32 *seclen);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *blob); -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);int security_inode_setsecctx (struct dentry *dentry,void *ctx,u32 ctxlen);
@@ -1310,7 +1345,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 +4 -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;
@@ -102,7 +103,9 @@ 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); +/*scaffolding*/ +lsmcontext_init (&context, secdata, seclen,0 ); +security_release_secctx (&context); } } }
kernel/audit.c +10 -4
@@ -1180,6 +1180,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)
@@ -1424,15 +1425,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);
@@ -2061,6 +2065,7 @@ int audit_log_task_context(struct audit_buffer *ab)unsigned len;int error;struct lsmblob blob; +struct lsmcontext scaff;/* scaffolding */ security_task_getsecid (current, &blob);if (!lsmblob_is_set (&blob))
@@ -2074,7 +2079,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
@@ -962,6 +962,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, struct lsmblob *blob, char *comm) { struct audit_buffer *ab; +struct lsmcontext lsmcxt;char *ctx =NULL ;u32 len;int rc =0 ;
@@ -979,7 +980,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=" );
@@ -1192,6 +1194,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;
@@ -1225,7 +1228,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) {
@@ -1371,6 +1375,7 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,char *ctx =NULL ;u32 len;struct lsmblob blob; +struct lsmcontext lsmcxt;lsmblob_init (&blob, n->osid);if (security_secid_to_secctx (&blob, &ctx, &len)) {
@@ -1379,7 +1384,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
@@ -332,6 +332,7 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)int len, ret;char *secctx;struct lsmblob blob; +struct lsmcontext context;lsmblob_init (&blob, ct->secmark); ret =security_secid_to_secctx (&blob, &secctx, &len);
@@ -349,7 +350,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 blob; +struct lsmcontext context;lsmblob_init (&blob, ct->secmark); ret =security_secid_to_secctx (&blob, &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
@@ -395,6 +395,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 ;
@@ -625,8 +626,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:
@@ -634,8 +637,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
@@ -373,6 +373,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 blob;
@@ -443,7 +444,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);
@@ -474,6 +477,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 blob;
@@ -502,7 +506,9 @@ static int netlbl_unlhsh_remove_addr4(struct net *net, security_secid_to_secctx(&blob, &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);
@@ -539,6 +545,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 blob;
@@ -566,7 +573,8 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, security_secid_to_secctx(&blob, &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);
@@ -1080,6 +1088,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;
@@ -1147,7 +1156,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
@@ -84,6 +84,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 blob;
@@ -103,7 +104,8 @@ struct audit_buffer *netlbl_audit_start_common(int type,if (audit_info->secid !=0 &&security_secid_to_secctx (&blob, &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 +12 -6
@@ -2144,17 +2144,23 @@ int security_secctx_to_secid(const char *secdata, u32 seclen, }EXPORT_SYMBOL (security_secctx_to_secid); -void security_release_secctx (char *secdata,u32 seclen) +void security_release_secctx (struct lsmcontext *cp) {struct security_hook_list *hp; -int *display = current->security; +bool found = false;hlist_for_each_entry (hp, &security_hook_heads.release_secctx, list) -if (display ==NULL || *display ==LSMBLOB_INVALID || - *display == hp->lsmid->slot) { - hp->hook.release_secctx (secdata, seclen); -return ; +if (cp->slot == hp->lsmid->slot) { + hp->hook.release_secctx (cp->context, cp->len); + found = true; +break ; } + +memset (cp,0 ,sizeof (*cp)); + +if (!found) +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
@@ -4483,11 +4483,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) {
@@ -4730,6 +4735,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 v11 15/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 | 26 +++++++--------- include/linux/security.h | 4 +-- include/net/scm.h | 10 ++----- 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 | 10 +++++-- 12 files changed, 74 insertions(+), 116 deletions(-)
drivers/android/binder.c +10 -16
@@ -2863,9 +2863,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;
@@ -3113,14 +3111,14 @@ static void binder_transaction(struct binder_proc *proc,size_t added_size;security_task_getsecid (proc->tsk, &blob); - ret =security_secid_to_secctx (&blob, &secctx, &secctx_sz); + ret =security_secid_to_secctx (&blob, &lsmctx);if (ret) { return_error =BR_FAILED_REPLY ; return_error_param = ret; return_error_line = __LINE__; goto err_get_secctx_failed; } - added_size =ALIGN (secctx_sz,sizeof (u64)); + added_size =ALIGN (lsmctx.len,sizeof (u64)); extra_buffers_size += added_size;if (extra_buffers_size < added_size) {/* integer overflow of extra_buffers_size */
@@ -3147,24 +3145,22 @@ static void binder_transaction(struct binder_proc *proc, t->buffer =NULL ; goto err_binder_alloc_buf_failed; } -if (secctx) { +if (lsmctx.context) {int err;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; err =binder_alloc_copy_to_buffer (&target_proc->alloc, t->buffer, buf_offset, - secctx, secctx_sz); + lsmctx.context, lsmctx.len);if (err) { t->security_ctx =0 ;WARN_ON (1 ); } -lsmcontext_init (&scaff, secctx, secctx_sz,0 ); -security_release_secctx (&scaff); - secctx =NULL ; +security_release_secctx (&lsmctx); } t->buffer->debug_id = t->debug_id; t->buffer->transaction = t;
@@ -3220,7 +3216,7 @@ static void binder_transaction(struct binder_proc *proc, off_end_offset = off_start_offset + tr->offsets_size; sg_buf_offset =ALIGN (off_end_offset,sizeof (void *)); sg_buf_end_offset = sg_buf_offset + extra_buffers_size - -ALIGN (secctx_sz,sizeof (u64)); +ALIGN (lsmctx.len,sizeof (u64)); off_min =0 ;for (buffer_offset = off_start_offset; buffer_offset < off_end_offset; buffer_offset +=sizeof (binder_size_t)) {
@@ -3496,10 +3492,8 @@ static void binder_transaction(struct binder_proc *proc,binder_alloc_free_buf (&target_proc->alloc, t->buffer); err_binder_alloc_buf_failed: err_bad_extra_size: -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
@@ -528,7 +528,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 *blob,char **secdata,u32 *seclen); +int security_secid_to_secctx (struct lsmblob *blob,struct lsmcontext *cp);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *blob);void security_release_secctx (struct lsmcontext *cp);
@@ -1333,7 +1333,7 @@ static inline int security_ismaclabel(const char *name) }static inline int security_secid_to_secctx (struct lsmblob *blob, -char **secdata,u32 *seclen) +struct lsmcontext *cp) {return -EOPNOTSUPP ; }
include/net/scm.h +3 -7
@@ -93,18 +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); -/*scaffolding*/ -lsmcontext_init (&context, secdata, seclen,0 ); +put_cmsg (msg,SOL_SOCKET ,SCM_SECURITY , + context.len, context.context);security_release_secctx (&context); } }
kernel/audit.c +11 -18
@@ -1178,9 +1178,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)
@@ -1418,25 +1417,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);
@@ -2061,26 +2057,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 blob; -struct lsmcontext scaff;/* scaffolding */ +struct lsmcontext context;security_task_getsecid (current, &blob);if (!lsmblob_is_set (&blob))return 0 ; - error =security_secid_to_secctx (&blob, &ctx, &len); + error =security_secid_to_secctx (&blob, &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
@@ -962,9 +962,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, struct lsmblob *blob, 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 );
@@ -975,13 +973,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 (blob)) { -if (security_secid_to_secctx (blob, &ctx, &len)) { +if (security_secid_to_secctx (blob, &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=" );
@@ -1194,7 +1191,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;
@@ -1218,17 +1214,15 @@ 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 blob;lsmblob_init (&blob, osid); -if (security_secid_to_secctx (&blob, &ctx, &len)) { +if (security_secid_to_secctx (&blob, &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); } }
@@ -1372,20 +1366,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 blob; -struct lsmcontext lsmcxt; +struct lsmcontext lsmctx;lsmblob_init (&blob, n->osid); -if (security_secid_to_secctx (&blob, &ctx, &len)) { +if (security_secid_to_secctx (&blob, &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
@@ -329,13 +329,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 blob;struct lsmcontext context;lsmblob_init (&blob, ct->secmark); - ret =security_secid_to_secctx (&blob, &secctx, &len); + ret =security_secid_to_secctx (&blob, &context);if (ret)return 0 ;
@@ -344,13 +343,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; }
@@ -626,12 +624,16 @@ static inline int ctnetlink_secctx_size(const struct nf_conn *ct)#ifdef CONFIG_NF_CONNTRACK_SECMARK int len, ret;struct lsmblob blob; +struct lsmcontext context;lsmblob_init (&blob, ct->secmark); - ret =security_secid_to_secctx (&blob,NULL , &len); + ret =security_secid_to_secctx (&blob, &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 blob;struct lsmcontext context;lsmblob_init (&blob, ct->secmark); - ret =security_secid_to_secctx (&blob, &secctx, &len); + ret =security_secid_to_secctx (&blob, &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
@@ -306,6 +306,7 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata)u32 seclen =0 ;#if IS_ENABLED (CONFIG_NETWORK_SECMARK )struct lsmblob blob; +struct lsmcontext context = { };if (!skb || !sk_fullsock (skb->sk))return 0 ;
@@ -314,10 +315,12 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, char **secdata)if (skb->secmark) {lsmblob_init (&blob, skb->secmark); -security_secid_to_secctx (&blob, secdata, &seclen); +security_secid_to_secctx (&blob, &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
@@ -374,8 +374,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 blob; if (addr_len != sizeof(struct in_addr) &&
@@ -440,12 +438,9 @@ int netlbl_unlhsh_add(struct net *net,rcu_read_unlock ();if (audit_buf !=NULL ) {lsmblob_init (&blob, secid); -if (security_secid_to_secctx (&blob, - &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 (&blob, &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 );
@@ -478,8 +473,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 blob;spin_lock (&netlbl_unlhsh_lock);
@@ -503,11 +496,9 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,if (entry !=NULL )lsmblob_init (&blob, entry->secid);if (entry !=NULL && -security_secid_to_secctx (&blob, - &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 (&blob, &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 );
@@ -546,8 +537,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 blob;spin_lock (&netlbl_unlhsh_lock);
@@ -570,10 +559,9 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,if (entry !=NULL )lsmblob_init (&blob, entry->secid);if (entry !=NULL && -security_secid_to_secctx (&blob, - &secctx, &secctx_len) ==0 ) { -audit_log_format (audit_buf," sec_obj=%s" , secctx); -lsmcontext_init (&context, secctx, secctx_len,0 ); +security_secid_to_secctx (&blob, &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 );
@@ -1091,8 +1079,6 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd,struct lsmcontext context;void *data;u32 secid; -char *secctx; -u32 secctx_len;struct lsmblob blob; data = genlmsg_put(cb_arg->skb, NETLINK_CB(cb_arg->nl_cb->skb).portid,
@@ -1149,15 +1135,13 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, }lsmblob_init (&blob, secid); - ret_val =security_secid_to_secctx (&blob, &secctx, &secctx_len); + ret_val =security_secid_to_secctx (&blob, &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
@@ -85,8 +85,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 blob;if (audit_enabled ==AUDIT_OFF )
@@ -102,9 +100,8 @@ struct audit_buffer *netlbl_audit_start_common(int type,lsmblob_init (&blob, audit_info->secid);if (audit_info->secid !=0 && -security_secid_to_secctx (&blob, &secctx, &secctx_len) ==0 ) { -audit_log_format (audit_buf," subj=%s" , secctx); -lsmcontext_init (&context, secctx, secctx_len,0 );/*scaffolding*/ +security_secid_to_secctx (&blob, &context) ==0 ) { +audit_log_format (audit_buf," subj=%s" , context.context);security_release_secctx (&context); }
security/security.c +7 -3
@@ -2109,18 +2109,22 @@ int security_ismaclabel(const char *name) }EXPORT_SYMBOL (security_ismaclabel); -int security_secid_to_secctx (struct lsmblob *blob,char **secdata,u32 *seclen) +int security_secid_to_secctx (struct lsmblob *blob,struct lsmcontext *cp) {struct security_hook_list *hp;int display =lsm_task_display (current); +memset (cp,0 ,sizeof (*cp)); +hlist_for_each_entry (hp, &security_hook_heads.secid_to_secctx, list) {if (WARN_ON (hp->lsmid->slot <0 || hp->lsmid->slot >= lsm_slot))continue ; -if (display ==LSMBLOB_INVALID || display == hp->lsmid->slot) +if (display ==LSMBLOB_INVALID || display == hp->lsmid->slot) { + cp->slot = hp->lsmid->slot;return hp->hook.secid_to_secctx ( blob->secid[hp->lsmid->slot], - secdata, seclen); + &cp->context, &cp->len); + } }return 0 ; }
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v11 18/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
@@ -301,12 +301,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 blob; -struct lsmcontext context = { };if (!skb || !sk_fullsock (skb->sk))return 0 ;
@@ -314,15 +312,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 (&blob, skb->secmark); -security_secid_to_secctx (&blob, &context); - *secdata = context.context; +security_secid_to_secctx (&blob, 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)
@@ -398,8 +397,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 ))
@@ -466,7 +464,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); }
@@ -601,7 +599,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 )
@@ -629,10 +627,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:
@@ -640,10 +636,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 v11 19/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 accommodate the change. This requires that the modules using netlabel use the lsm_id.slot to access the correct secid when using netlabel.
--- 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/hooks.c | 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 | 5 ++- security/smack/smackfs.c | 10 +++-- 12 files changed, 50 insertions(+), 54 deletions(-)
include/net/netlabel.h +4 -4
@@ -166,7 +166,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
@@ -201,7 +201,7 @@ struct netlbl_lsm_secattr {struct netlbl_lsm_catmap *cat;u32 lvl; } mls; -u32 secid; +struct lsmblob lsmblob; } attr; };
@@ -415,7 +415,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,
@@ -523,7 +523,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
@@ -1467,7 +1467,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[0 ];return CIPSO_V4_TAG_LOC_BLEN ; }
@@ -1487,7 +1488,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[0] = *(u32 *)&tag[2]; secattr->flags |=NETLBL_SECATTR_SECID ;return 0 ;
net/netlabel/netlabel_kapi.c +3 -3
@@ -196,7 +196,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:
@@ -210,7 +210,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;
@@ -230,7 +230,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
@@ -211,7 +211,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/hooks.c +1 -1
@@ -6802,7 +6802,7 @@ struct lsm_blob_sizes selinux_blob_sizes __lsm_ro_after_init = { .lbs_sock = sizeof(struct sk_security_struct), }; -static struct lsm_id selinux_lsmid __lsm_ro_after_init = { +struct lsm_id selinux_lsmid __lsm_ro_after_init = { .lsm ="selinux" , .slot =LSMBLOB_NEEDED };
security/selinux/include/security.h +1 -0
@@ -69,6 +69,7 @@struct netlbl_lsm_secattr ;extern int selinux_enabled; +extern struct lsm_id selinux_lsmid;/* Policy capabilities */ enum {
security/selinux/netlabel.c +1 -1
@@ -108,7 +108,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_lsmid.slot] == sid))return secattr;return NULL ;
security/selinux/ss/services.c +2 -2
@@ -3599,7 +3599,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_lsmid.slot];else if (secattr->flags &NETLBL_SECATTR_MLS_LVL ) { rc = -EIDRM ; ctx =sidtab_search (sidtab,SECINITSID_NETMSG );
@@ -3672,7 +3672,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_lsmid.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
@@ -316,6 +316,7 @@ void smk_destroy_label_list(struct list_head *list);* Shared data. */ extern int smack_enabled; +extern struct lsm_id smack_lsmid;extern int smack_cipso_direct;extern int smack_cipso_mapped;extern struct smack_known *smack_net_ambient;
security/smack/smack_lsm.c +3 -2
@@ -3776,7 +3776,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_lsmid.slot]);/* * Without guidance regarding the smack value * for the packet fall back on the network
@@ -4598,7 +4599,7 @@ struct lsm_blob_sizes smack_blob_sizes __lsm_ro_after_init = { .lbs_sock = sizeof(struct socket_smack), }; -static struct lsm_id smack_lsmid __lsm_ro_after_init = { +struct lsm_id smack_lsmid __lsm_ro_after_init = { .lsm ="smack" , .slot =LSMBLOB_NEEDED };
security/smack/smackfs.c +7 -3
@@ -1122,6 +1122,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;
@@ -1253,10 +1254,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_lsmid.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 v11 21/25 Audit: Add subj_LSM fields when necessary
In reply to Casey SchauflerAdd record entries to identify subject data for all of the security modules when there is more than one.
--- drivers/android/binder.c | 2 +- include/linux/audit.h | 1 + include/linux/security.h | 9 ++++- include/net/scm.h | 3 +- kernel/audit.c | 40 ++++++++++++++++++- kernel/audit_fsnotify.c | 1 + kernel/auditfilter.c | 1 + kernel/auditsc.c | 10 +++-- net/ipv4/ip_sockglue.c | 2 +- net/netfilter/nf_conntrack_netlink.c | 4 +- net/netfilter/nf_conntrack_standalone.c | 2 +- net/netfilter/nfnetlink_queue.c | 2 +- net/netlabel/netlabel_unlabeled.c | 11 ++++-- net/netlabel/netlabel_user.c | 2 +- net/xfrm/xfrm_policy.c | 2 + net/xfrm/xfrm_state.c | 2 + security/integrity/ima/ima_api.c | 1 + security/integrity/integrity_audit.c | 1 + security/security.c | 51 +++++++++++++++++++++++-- 19 files changed, 124 insertions(+), 23 deletions(-)
drivers/android/binder.c +1 -1
@@ -3111,7 +3111,7 @@ static void binder_transaction(struct binder_proc *proc,size_t added_size;security_task_getsecid (proc->tsk, &blob); - ret =security_secid_to_secctx (&blob, &lsmctx); + ret =security_secid_to_secctx (&blob, &lsmctx,LSMBLOB_DISPLAY );if (ret) { return_error =BR_FAILED_REPLY ; return_error_param = ret;
include/linux/audit.h +1 -0
@@ -160,6 +160,7 @@ extern void audit_log_link_denied(const char *operation);extern void audit_log_lost (const char *message);extern int audit_log_task_context (struct audit_buffer *ab); +extern void audit_log_task_lsms (struct audit_buffer *ab);extern void audit_log_task_info (struct audit_buffer *ab);extern int audit_update_lsm_rules (void );
include/linux/security.h +7 -2
@@ -178,6 +178,8 @@ struct lsmblob {#define LSMBLOB_INVALID -1/* Not a valid LSM slot number */ #define LSMBLOB_NEEDED -2/* Slot requested on initialization */ #define LSMBLOB_NOT_NEEDED -3/* Slot not requested */ +#define LSMBLOB_DISPLAY -4/* Use the "display" slot */ +#define LSMBLOB_FIRST -5/* Use the default "display" slot */ /** * lsmblob_init - initialize an lsmblob structure.
@@ -219,6 +221,8 @@ static inline bool lsmblob_equal(struct lsmblob *bloba, struct lsmblob *blobb)return !memcmp (bloba, blobb,sizeof (*bloba)); } +const char *security_lsm_slot_name (int slot); +/* These functions are in security/commoncap.c */ extern int cap_capable (const struct cred *cred,struct user_namespace *ns,int cap,unsigned int opts);
@@ -528,7 +532,8 @@ 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 *blob,struct lsmcontext *cp); +int security_secid_to_secctx (struct lsmblob *blob,struct lsmcontext *cp, +int display);int security_secctx_to_secid (const char *secdata,u32 seclen,struct lsmblob *blob);void security_release_secctx (struct lsmcontext *cp);
@@ -1332,7 +1337,7 @@ static inline int security_ismaclabel(const char *name) }static inline int security_secid_to_secctx (struct lsmblob *blob, -struct lsmcontext *cp) +struct lsmcontext *cp,int display) {return -EOPNOTSUPP ; }
include/net/scm.h +2 -1
@@ -96,7 +96,8 @@ 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->lsmblob, &context); + err =security_secid_to_secctx (&scm->lsmblob, &context, +LSMBLOB_DISPLAY );if (!err) { put_cmsg(msg, SOL_SOCKET, SCM_SECURITY,
kernel/audit.c +38 -2
@@ -392,6 +392,7 @@ static int audit_log_config_change(char *function_name, u32 new, u32 old,if (rc) allow_changes =0 ;/* Something weird, deny request */ audit_log_format (ab," res=%d" , allow_changes); +audit_log_task_lsms (ab);audit_log_end (ab);return rc; }
@@ -1097,6 +1098,7 @@ static void audit_log_feature_change(int which, u32 old_feature, u32 new_featureaudit_log_format (ab," feature=%s old=%u new=%u old_lock=%u new_lock=%u res=%d" , audit_feature_names[which], !!old_feature, !!new_feature, !!old_lock, !!new_lock, res); +audit_log_task_lsms (ab);audit_log_end (ab); }
@@ -1347,6 +1349,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) size--;audit_log_n_untrustedstring (ab, data, size); } +audit_log_task_lsms (ab);audit_log_end (ab); }break ;
@@ -1361,6 +1364,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) msg_type ==AUDIT_ADD_RULE ?"add_rule" :"remove_rule" , audit_enabled); +audit_log_task_lsms (ab);audit_log_end (ab);return -EPERM ; }
@@ -1374,6 +1378,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)audit_log_common_recv_msg (audit_context (), &ab,AUDIT_CONFIG_CHANGE );audit_log_format (ab," op=trim res=1" ); +audit_log_task_lsms (ab);audit_log_end (ab);break ;case AUDIT_MAKE_EQUIV : {
@@ -1409,6 +1414,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)audit_log_format (ab," new=" );audit_log_untrustedstring (ab, new);audit_log_format (ab," res=%d" , !err); +audit_log_task_lsms (ab);audit_log_end (ab);kfree (old);kfree (new);
@@ -1418,7 +1424,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) len =0 ;if (lsmblob_is_set (&audit_sig_lsm)) { err =security_secid_to_secctx (&audit_sig_lsm, - &context); + &context,LSMBLOB_FIRST );if (err)return err; }
@@ -1477,6 +1483,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)" old-log_passwd=%d new-log_passwd=%d res=%d" , old.enabled, s.enabled, old.log_passwd, s.log_passwd, !err); +audit_log_task_lsms (ab);audit_log_end (ab);break ; }
@@ -2055,6 +2062,33 @@ void audit_log_key(struct audit_buffer *ab, char *key)audit_log_format (ab,"(null)" ); } +void audit_log_task_lsms (struct audit_buffer *ab) +{ +int i; +const char *lsm; +struct lsmblob blob; +struct lsmcontext context; + +/* +* Don't do anything unless there is more than one LSM +* with a security context to report. +*/ +if (security_lsm_slot_name (1 ) ==NULL ) +return ; + +security_task_getsecid (current, &blob); + +for (i =0 ; i <LSMBLOB_ENTRIES ; i++) { + lsm =security_lsm_slot_name (i); +if (lsm ==NULL ) +break ; +if (security_secid_to_secctx (&blob, &context, i)) +continue ; +audit_log_format (ab," subj_%s=%s" , lsm, context.context); +security_release_secctx (&context); + } +} +int audit_log_task_context (struct audit_buffer *ab) {int error;
@@ -2065,7 +2099,7 @@ int audit_log_task_context(struct audit_buffer *ab)if (!lsmblob_is_set (&blob))return 0 ; - error =security_secid_to_secctx (&blob, &context); + error =security_secid_to_secctx (&blob, &context,LSMBLOB_FIRST );if (error) {if (error != -EINVAL ) goto error_path;
@@ -2172,6 +2206,7 @@ void audit_log_link_denied(const char *operation)audit_log_format (ab,"op=%s" , operation);audit_log_task_info (ab);audit_log_format (ab," res=0" ); +audit_log_task_lsms (ab);audit_log_end (ab); }
@@ -2222,6 +2257,7 @@ static void audit_log_set_loginuid(kuid_t koldloginuid, kuid_t kloginuid, oldloginuid, loginuid, tty ?tty_name (tty) :"(none)" , oldsessionid, sessionid, !rc);audit_put_tty (tty); +audit_log_task_lsms (ab);audit_log_end (ab); }
kernel/audit_fsnotify.c +1 -0
@@ -126,6 +126,7 @@ static void audit_mark_log_rule_change(struct audit_fsnotify_mark *audit_mark, caudit_log_untrustedstring (ab, audit_mark->path);audit_log_key (ab, rule->filterkey);audit_log_format (ab," list=%d res=1" , rule->listnr); +audit_log_task_lsms (ab);audit_log_end (ab); }
kernel/auditfilter.c +1 -0
@@ -1103,6 +1103,7 @@ static void audit_log_rule_change(char *action, struct audit_krule *rule, int reaudit_log_format (ab," op=%s" , action);audit_log_key (ab, rule->filterkey);audit_log_format (ab," list=%d res=%d" , rule->listnr, res); +audit_log_task_lsms (ab);audit_log_end (ab); }
kernel/auditsc.c +7 -3
@@ -973,7 +973,7 @@ 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 (blob)) { -if (security_secid_to_secctx (blob, &lsmctx)) { +if (security_secid_to_secctx (blob, &lsmctx,LSMBLOB_FIRST )) {audit_log_format (ab," obj=(none)" ); rc =1 ; }else {
@@ -1218,7 +1218,8 @@ static void show_special(struct audit_context *context, int *call_panic)struct lsmblob blob;lsmblob_init (&blob, osid); -if (security_secid_to_secctx (&blob, &lsmcxt)) { +if (security_secid_to_secctx (&blob, &lsmcxt, +LSMBLOB_FIRST )) {audit_log_format (ab," osid=%u" , osid); *call_panic =1 ; }else {
@@ -1370,7 +1371,7 @@ static void audit_log_name(struct audit_context *context, struct audit_names *n,struct lsmcontext lsmctx;lsmblob_init (&blob, n->osid); -if (security_secid_to_secctx (&blob, &lsmctx)) { +if (security_secid_to_secctx (&blob, &lsmctx,LSMBLOB_FIRST )) {audit_log_format (ab," osid=%u" , n->osid);if (call_panic) *call_panic =2 ;
@@ -1479,6 +1480,7 @@ static void audit_log_exit(void)audit_log_task_info (ab);audit_log_key (ab, context->filterkey); +audit_log_task_lsms (ab);audit_log_end (ab);for (aux = context->aux; aux; aux = aux->next) {
@@ -2602,6 +2604,7 @@ void audit_core_dumps(long signr)return ;audit_log_task (ab);audit_log_format (ab," sig=%ld res=1" , signr); +audit_log_task_lsms (ab);audit_log_end (ab); }
@@ -2628,6 +2631,7 @@ void audit_seccomp(unsigned long syscall, long signr, int code)audit_log_format (ab," sig=%ld arch=%x syscall=%ld compat=%d ip=0x%lx code=0x%x" , signr,syscall_get_arch (current), syscall,in_compat_syscall (),KSTK_EIP (current), code); +audit_log_task_lsms (ab);audit_log_end (ab); }
net/ipv4/ip_sockglue.c +1 -1
@@ -138,7 +138,7 @@ static void ip_cmsg_recv_security(struct msghdr *msg, struct sk_buff *skb)if (err)return ; - err =security_secid_to_secctx (&lb, &context); + err =security_secid_to_secctx (&lb, &context,LSMBLOB_DISPLAY );if (err)return ;
net/netfilter/nf_conntrack_netlink.c +2 -2
@@ -334,7 +334,7 @@ static int ctnetlink_dump_secctx(struct sk_buff *skb, const struct nf_conn *ct)struct lsmcontext context;lsmblob_init (&blob, ct->secmark); - ret =security_secid_to_secctx (&blob, &context); + ret =security_secid_to_secctx (&blob, &context,LSMBLOB_DISPLAY );if (ret)return 0 ;
@@ -627,7 +627,7 @@ static inline int ctnetlink_secctx_size(const struct nf_conn *ct)struct lsmcontext context;lsmblob_init (&blob, ct->secmark); - ret =security_secid_to_secctx (&blob, &context); + ret =security_secid_to_secctx (&blob, &context,LSMBLOB_DISPLAY );if (ret)return 0 ;
net/netfilter/nf_conntrack_standalone.c +1 -1
@@ -177,7 +177,7 @@ static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)struct lsmcontext context;lsmblob_init (&blob, ct->secmark); - ret =security_secid_to_secctx (&blob, &context); + ret =security_secid_to_secctx (&blob, &context,LSMBLOB_DISPLAY );if (ret)return ;
net/netfilter/nfnetlink_queue.c +1 -1
@@ -314,7 +314,7 @@ static u32 nfqnl_get_sk_secctx(struct sk_buff *skb, struct lsmcontext *context)if (skb->secmark) {/* Any LSM might be looking for the secmark */ lsmblob_init (&blob, skb->secmark); -security_secid_to_secctx (&blob, context); +security_secid_to_secctx (&blob, context,LSMBLOB_DISPLAY ); }read_unlock_bh (&skb->sk->sk_callback_lock);
net/netlabel/netlabel_unlabeled.c +7 -4
@@ -436,7 +436,8 @@ int netlbl_unlhsh_add(struct net *net, unlhsh_add_return:rcu_read_unlock ();if (audit_buf !=NULL ) { -if (security_secid_to_secctx (lsmblob, &context) ==0 ) { +if (security_secid_to_secctx (lsmblob, &context, +LSMBLOB_FIRST ) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , context.context);security_release_secctx (&context);
@@ -491,7 +492,8 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,if (dev !=NULL )dev_put (dev);if (entry !=NULL && -security_secid_to_secctx (&entry->lsmblob, &context) ==0 ) { +security_secid_to_secctx (&entry->lsmblob, &context, +LSMBLOB_FIRST ) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , context.context);security_release_secctx (&context);
@@ -551,7 +553,8 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,if (dev !=NULL )dev_put (dev);if (entry !=NULL && -security_secid_to_secctx (&entry->lsmblob, &context) ==0 ) { +security_secid_to_secctx (&entry->lsmblob, &context, +LSMBLOB_FIRST ) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , context.context);security_release_secctx (&context);
@@ -1122,7 +1125,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, lsmb = (struct lsmblob *)&addr6->lsmblob; } - ret_val =security_secid_to_secctx (lsmb, &context); + ret_val =security_secid_to_secctx (lsmb, &context,LSMBLOB_FIRST );if (ret_val !=0 ) goto list_cb_failure; ret_val = nla_put(cb_arg->skb,
net/netlabel/netlabel_user.c +1 -1
@@ -100,7 +100,7 @@ struct audit_buffer *netlbl_audit_start_common(int type,lsmblob_init (&blob, audit_info->secid);if (audit_info->secid !=0 && -security_secid_to_secctx (&blob, &context) ==0 ) { +security_secid_to_secctx (&blob, &context,LSMBLOB_FIRST ) ==0 ) {audit_log_format (audit_buf," subj=%s" , context.context);security_release_secctx (&context); }
net/xfrm/xfrm_policy.c +2 -0
@@ -4206,6 +4206,7 @@ void xfrm_audit_policy_add(struct xfrm_policy *xp, int result, bool task_valid)xfrm_audit_helper_usrinfo (task_valid, audit_buf);audit_log_format (audit_buf," res=%u" , result);xfrm_audit_common_policyinfo (xp, audit_buf); +audit_log_task_lsms (audit_buf);audit_log_end (audit_buf); }EXPORT_SYMBOL_GPL (xfrm_audit_policy_add);
@@ -4221,6 +4222,7 @@ void xfrm_audit_policy_delete(struct xfrm_policy *xp, int result,xfrm_audit_helper_usrinfo (task_valid, audit_buf);audit_log_format (audit_buf," res=%u" , result);xfrm_audit_common_policyinfo (xp, audit_buf); +audit_log_task_lsms (audit_buf);audit_log_end (audit_buf); }EXPORT_SYMBOL_GPL (xfrm_audit_policy_delete);
net/xfrm/xfrm_state.c +2 -0
@@ -2640,6 +2640,7 @@ void xfrm_audit_state_add(struct xfrm_state *x, int result, bool task_valid)xfrm_audit_helper_usrinfo (task_valid, audit_buf);xfrm_audit_helper_sainfo (x, audit_buf);audit_log_format (audit_buf," res=%u" , result); +audit_log_task_lsms (audit_buf);audit_log_end (audit_buf); }EXPORT_SYMBOL_GPL (xfrm_audit_state_add);
@@ -2654,6 +2655,7 @@ void xfrm_audit_state_delete(struct xfrm_state *x, int result, bool task_valid)xfrm_audit_helper_usrinfo (task_valid, audit_buf);xfrm_audit_helper_sainfo (x, audit_buf);audit_log_format (audit_buf," res=%u" , result); +audit_log_task_lsms (audit_buf);audit_log_end (audit_buf); }EXPORT_SYMBOL_GPL (xfrm_audit_state_delete);
security/integrity/ima/ima_api.c +1 -0
@@ -363,6 +363,7 @@ void ima_audit_measurement(struct integrity_iint_cache *iint,audit_log_format (ab," hash=\"%s:%s\"" , algo_name, hash);audit_log_task_info (ab); +audit_log_task_lsms (ab);audit_log_end (ab); iint->flags |=IMA_AUDITED ;
security/integrity/integrity_audit.c +1 -0
@@ -54,5 +54,6 @@ void integrity_audit_msg(int audit_msgno, struct inode *inode,audit_log_format (ab," ino=%lu" , inode->i_ino); }audit_log_format (ab," res=%d" , !result); +audit_log_task_lsms (ab);audit_log_end (ab); }
security/security.c +47 -4
74 lines not on this page · raw message
Signature · 1 line
2.20.1
Casey Schaufler
maintainerPATCH v11 23/25 NET: Add SO_PEERCONTEXT for multiple LSMs
In reply to Casey SchauflerThe getsockopt SO_PEERSEC provides the LSM based security information for a single module, but for reasons of backward compatibility cannot include the information for multiple modules. A new option SO_PEERCONTEXT is added to report the security "context" of multiple modules using a "compound" format
lsm1\0value\0lsm2\0value\0
This is expected to be used by system services, including dbus-daemon. The exact format of a compound context has been the subject of considerable debate. This format was suggested by Simon McVittie, a dbus maintainer with a significant stake in the format being usable.
--- arch/alpha/include/uapi/asm/socket.h | 1 + arch/mips/include/uapi/asm/socket.h | 1 + arch/parisc/include/uapi/asm/socket.h | 1 + arch/sparc/include/uapi/asm/socket.h | 1 + include/linux/lsm_hooks.h | 9 +- include/linux/security.h | 11 ++- include/uapi/asm-generic/socket.h | 1 + kernel/audit.c | 4 +- net/core/sock.c | 7 +- net/netlabel/netlabel_unlabeled.c | 9 +- net/netlabel/netlabel_user.c | 2 +- security/apparmor/lsm.c | 20 ++--- security/security.c | 118 +++++++++++++++++++++++--- security/selinux/hooks.c | 20 ++--- security/smack/smack_lsm.c | 31 +++---- 15 files changed, 164 insertions(+), 72 deletions(-)
arch/alpha/include/uapi/asm/socket.h +1 -0
@@ -123,6 +123,7 @@#define SO_SNDTIMEO_NEW 67#define SO_DETACH_REUSEPORT_BPF 68 +#define SO_PEERCONTEXT 69#if !defined(__KERNEL__)
arch/mips/include/uapi/asm/socket.h +1 -0
@@ -134,6 +134,7 @@#define SO_SNDTIMEO_NEW 67#define SO_DETACH_REUSEPORT_BPF 68 +#define SO_PEERCONTEXT 69#if !defined(__KERNEL__)
arch/parisc/include/uapi/asm/socket.h +1 -0
@@ -115,6 +115,7 @@#define SO_SNDTIMEO_NEW 0x4041#define SO_DETACH_REUSEPORT_BPF 0x4042 +#define SO_PEERCONTEXT 0x4043#if !defined(__KERNEL__)
arch/sparc/include/uapi/asm/socket.h +1 -0
@@ -116,6 +116,7 @@#define SO_SNDTIMEO_NEW 0x0045#define SO_DETACH_REUSEPORT_BPF 0x0047 +#define SO_PEERCONTEXT 0x0048#if !defined(__KERNEL__)
include/linux/lsm_hooks.h +4 -5
@@ -880,8 +880,8 @@* SO_GETPEERSEC. For tcp sockets this can be meaningful if the * socket is associated with an ipsec SA. * @sock is the local socket. -* @optval userspace memory where the security state is to be copied. -* @optlen userspace int where the module should copy the actual length +* @optval memory where the security state is to be copied. +* @optlen int where the module should copy the actual length * of the security state. * @len as input is the maximum length to copy to userspace provided * by the caller.
@@ -1724,9 +1724,8 @@ union security_list_options {int (*socket_setsockopt)(struct socket *sock,int level,int optname);int (*socket_shutdown)(struct socket *sock,int how);int (*socket_sock_rcv_skb)(struct sock *sk,struct sk_buff *skb); -int (*socket_getpeersec_stream)(struct socket *sock, -char __user *optval, -int __user *optlen,unsigned len); +int (*socket_getpeersec_stream)(struct socket *sock,char **optval, +int *optlen,unsigned len);int (*socket_getpeersec_dgram)(struct socket *sock,struct sk_buff *skb,u32 *secid);int (*sk_alloc_security)(struct sock *sk,int family,gfp_t priority);
include/linux/security.h +7 -4
@@ -179,7 +179,7 @@ struct lsmblob {#define LSMBLOB_NEEDED -2/* Slot requested on initialization */ #define LSMBLOB_NOT_NEEDED -3/* Slot not requested */ #define LSMBLOB_DISPLAY -4/* Use the "display" slot */ -#define LSMBLOB_FIRST -5/* Use the default "display" slot */ +#define LSMBLOB_COMPOUND -5/* A compound "display" */ /** * lsmblob_init - initialize an lsmblob structure.
@@ -1398,7 +1398,8 @@ int security_socket_setsockopt(struct socket *sock, int level, int optname);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 __user *optlen,unsigned len, +int display);int security_socket_getpeersec_dgram (struct socket *sock,struct sk_buff *skb,struct lsmblob *blob);int security_sk_alloc (struct sock *sk,int family,gfp_t priority);
@@ -1532,8 +1533,10 @@ static inline int security_sock_rcv_skb(struct sock *sk,return 0 ; } -static inline int security_socket_getpeersec_stream (struct socket *sock,char __user *optval, -int __user *optlen,unsigned len) +static inline int security_socket_getpeersec_stream (struct socket *sock, +char __user *optval, +int __user *optlen, +unsigned len,int display) {return -ENOPROTOOPT ; }
include/uapi/asm-generic/socket.h +1 -0
@@ -118,6 +118,7 @@#define SO_SNDTIMEO_NEW 67#define SO_DETACH_REUSEPORT_BPF 68 +#define SO_PEERCONTEXT 69#if !defined(__KERNEL__)
kernel/audit.c +2 -2
@@ -1424,7 +1424,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) len =0 ;if (lsmblob_is_set (&audit_sig_lsm)) { err =security_secid_to_secctx (&audit_sig_lsm, - &context,LSMBLOB_FIRST ); + &context,0 );if (err)return err; }
@@ -2099,7 +2099,7 @@ int audit_log_task_context(struct audit_buffer *ab)if (!lsmblob_is_set (&blob))return 0 ; - error =security_secid_to_secctx (&blob, &context,LSMBLOB_FIRST ); + error =security_secid_to_secctx (&blob, &context,0 );if (error) {if (error != -EINVAL ) goto error_path;
net/core/sock.c +6 -1
@@ -1413,7 +1413,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,break ;case SO_PEERSEC : -return security_socket_getpeersec_stream (sock, optval, optlen, len); +return security_socket_getpeersec_stream (sock, optval, optlen, + len,LSMBLOB_DISPLAY ); + +case SO_PEERCONTEXT : +return security_socket_getpeersec_stream (sock, optval, optlen, + len,LSMBLOB_COMPOUND );case SO_MARK : v.val = sk->sk_mark;
net/netlabel/netlabel_unlabeled.c +4 -5
@@ -436,8 +436,7 @@ int netlbl_unlhsh_add(struct net *net, unlhsh_add_return:rcu_read_unlock ();if (audit_buf !=NULL ) { -if (security_secid_to_secctx (lsmblob, &context, -LSMBLOB_FIRST ) ==0 ) { +if (security_secid_to_secctx (lsmblob, &context,0 ) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , context.context);security_release_secctx (&context);
@@ -493,7 +492,7 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,dev_put (dev);if (entry !=NULL &&security_secid_to_secctx (&entry->lsmblob, &context, -LSMBLOB_FIRST ) ==0 ) { +0 ) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , context.context);security_release_secctx (&context);
@@ -554,7 +553,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,dev_put (dev);if (entry !=NULL &&security_secid_to_secctx (&entry->lsmblob, &context, -LSMBLOB_FIRST ) ==0 ) { +0 ) ==0 ) {audit_log_format (audit_buf," sec_obj=%s" , context.context);security_release_secctx (&context);
@@ -1125,7 +1124,7 @@ static int netlbl_unlabel_staticlist_gen(u32 cmd, lsmb = (struct lsmblob *)&addr6->lsmblob; } - ret_val =security_secid_to_secctx (lsmb, &context,LSMBLOB_FIRST ); + ret_val =security_secid_to_secctx (lsmb, &context,0 );if (ret_val !=0 ) goto list_cb_failure; ret_val = nla_put(cb_arg->skb,
net/netlabel/netlabel_user.c +1 -1
@@ -100,7 +100,7 @@ struct audit_buffer *netlbl_audit_start_common(int type,lsmblob_init (&blob, audit_info->secid);if (audit_info->secid !=0 && -security_secid_to_secctx (&blob, &context,LSMBLOB_FIRST ) ==0 ) { +security_secid_to_secctx (&blob, &context,0 ) ==0 ) {audit_log_format (audit_buf," subj=%s" , context.context);security_release_secctx (&context); }
security/apparmor/lsm.c +6 -14
@@ -1065,10 +1065,8 @@ static struct aa_label *sk_peer_label(struct sock *sk)* * Note: for tcp only valid if using ipsec or cipso on lan */ -static int apparmor_socket_getpeersec_stream (struct socket *sock, -char __user *optval, -int __user *optlen, -unsigned int len) +static int apparmor_socket_getpeersec_stream (struct socket *sock,char **optval, +int *optlen,unsigned int len) {char *name;int slen, error =0 ;
@@ -1088,17 +1086,11 @@ static int apparmor_socket_getpeersec_stream(struct socket *sock,if (slen <0 ) { error = -ENOMEM ; }else { -if (slen > len) { +if (slen > len) error = -ERANGE ; - }else if (copy_to_user (optval, name, slen)) { - error = -EFAULT ; - goto out; - } -if (put_user (slen, optlen)) - error = -EFAULT ; -out: -kfree (name); - +else + *optval = name; + *optlen = slen; } done:
security/security.c +107 -11
157 lines not on this page · raw message
security/selinux/hooks.c +6 -14
@@ -5048,10 +5048,8 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)return err; } -static int selinux_socket_getpeersec_stream (struct socket *sock, -char __user *optval, -int __user *optlen, -unsigned int len) +static int selinux_socket_getpeersec_stream (struct socket *sock,char **optval, +int *optlen,unsigned int len) {int err =0 ;char *scontext;
@@ -5071,18 +5069,12 @@ static int selinux_socket_getpeersec_stream(struct socket *sock,if (err)return err; -if (scontext_len > len) { +if (scontext_len > len) err = -ERANGE ; - goto out_len; - } - -if (copy_to_user (optval, scontext, scontext_len)) - err = -EFAULT ; +else + *optval = scontext; -out_len: -if (put_user (scontext_len, optlen)) - err = -EFAULT ; -kfree (scontext); + *optlen = scontext_len;return err; }
security/smack/smack_lsm.c +16 -15
@@ -3958,28 +3958,29 @@ static int smack_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)* * returns zero on success, an error code otherwise */ -static int smack_socket_getpeersec_stream (struct socket *sock, -char __user *optval, -int __user *optlen,unsigned len) +static int smack_socket_getpeersec_stream (struct socket *sock,char **optval, +int *optlen,unsigned len) { -struct socket_smack *ssp; -char *rcp ="" ; -int slen =1 ; +struct socket_smack *ssp =smack_sock (sock->sk); +char *rcp; +int slen;int rc =0 ; - ssp =smack_sock (sock->sk); -if (ssp->smk_packet !=NULL ) { - rcp = ssp->smk_packet->smk_known; - slen =strlen (rcp) +1 ; +if (ssp->smk_packet ==NULL ) { + *optlen =0 ; +return -EINVAL ; } + rcp = ssp->smk_packet->smk_known; + slen =strlen (rcp) +1 ;if (slen > len) rc = -ERANGE ; -else if (copy_to_user (optval, rcp, slen) !=0 ) - rc = -EFAULT ; - -if (put_user (slen, optlen) !=0 ) - rc = -EFAULT ; +else { + *optval =kstrdup (rcp,GFP_KERNEL ); +if (*optval ==NULL ) + rc = -ENOMEM ; + } + *optlen = slen;return rc; }
Signature · 1 line
2.20.1