From: Stephen Smalley <sds@epoch.ncsc.mil>
This patch reworks the SELinux binprm hook functions to use a security
structure for the linux_binprm rather than directly stuffing the security
identifier into the void* security field. It also performs some cleanup of
the SELinux binprm hook functions, and one miscellaneous fix.
25-akpm/security/selinux/hooks.c | 61 ++++++++++++------------------
25-akpm/security/selinux/include/objsec.h | 8 +++
2 files changed, 34 insertions(+), 35 deletions(-)
diff -puN security/selinux/hooks.c~selinux-binprm-hooks-rework security/selinux/hooks.c
--- 25/security/selinux/hooks.c~selinux-binprm-hooks-rework Tue Aug 26 12:28:43 2003
+++ 25-akpm/security/selinux/hooks.c Tue Aug 26 12:28:43 2003
@@ -1332,31 +1332,19 @@ static int selinux_netlink_recv(struct s
static int selinux_bprm_alloc_security(struct linux_binprm *bprm)
{
- int rc;
+ struct bprm_security_struct *bsec;
- /* Make sure that the secondary module doesn't use the
- bprm->security field, since we do not yet support chaining
- of multiple security structures on the field. Neither
- the dummy nor the capability module use the field. The owlsm
- module uses the field if CONFIG_OWLSM_FD is enabled. */
- rc = secondary_ops->bprm_alloc_security(bprm);
- if (rc)
- return rc;
- if (bprm->security) {
- printk(KERN_WARNING "%s: no support yet for chaining on the "
- "security field by secondary modules.\n", __FUNCTION__);
- /* Release the secondary module's security object. */
- secondary_ops->bprm_free_security(bprm);
- /* Unregister the secondary module to prevent problems
- with subsequent binprm hooks. This will revert to the
- original (dummy) module for the secondary operations. */
- rc = security_ops->unregister_security("unknown", secondary_ops);
- if (rc)
- return rc;
- printk(KERN_WARNING "%s: Unregistered the secondary security "
- "module.\n", __FUNCTION__);
- }
- bprm->security = NULL;
+ bsec = kmalloc(sizeof(struct bprm_security_struct), GFP_KERNEL);
+ if (!bsec)
+ return -ENOMEM;
+
+ memset(bsec, 0, sizeof *bsec);
+ bsec->magic = SELINUX_MAGIC;
+ bsec->bprm = bprm;
+ bsec->sid = SECINITSID_UNLABELED;
+ bsec->set = 0;
+
+ bprm->security = bsec;
return 0;
}
@@ -1365,6 +1353,7 @@ static int selinux_bprm_set_security(str
struct task_security_struct *tsec;
struct inode *inode = bprm->file->f_dentry->d_inode;
struct inode_security_struct *isec;
+ struct bprm_security_struct *bsec;
u32 newsid;
struct avc_audit_data ad;
int rc;
@@ -1373,15 +1362,16 @@ static int selinux_bprm_set_security(str
if (rc)
return rc;
- if (bprm->sh_bang || bprm->security)
- /* The security field should already be set properly. */
+ bsec = bprm->security;
+
+ if (bsec->set)
return 0;
tsec = current->security;
isec = inode->i_security;
/* Default to the current task SID. */
- bprm->security = (void *)tsec->sid;
+ bsec->sid = tsec->sid;
/* Reset create SID on execve. */
tsec->create_sid = 0;
@@ -1427,9 +1417,10 @@ static int selinux_bprm_set_security(str
return rc;
/* Set the security field to the new SID. */
- bprm->security = (void*) newsid;
+ bsec->sid = newsid;
}
+ bsec->set = 1;
return 0;
}
@@ -1463,8 +1454,9 @@ static int selinux_bprm_secureexec (stru
static void selinux_bprm_free_security(struct linux_binprm *bprm)
{
- /* Nothing to do - not dynamically allocated. */
- return;
+ struct bprm_security_struct *bsec = bprm->security;
+ bprm->security = NULL;
+ kfree(bsec);
}
/* Derived from fs/exec.c:flush_old_files. */
@@ -1509,6 +1501,7 @@ static inline void flush_unauthorized_fi
static void selinux_bprm_compute_creds(struct linux_binprm *bprm)
{
struct task_security_struct *tsec, *psec;
+ struct bprm_security_struct *bsec;
u32 sid;
struct av_decision avd;
int rc;
@@ -1517,9 +1510,8 @@ static void selinux_bprm_compute_creds(s
tsec = current->security;
- sid = (u32)bprm->security;
- if (!sid)
- sid = tsec->sid;
+ bsec = bprm->security;
+ sid = bsec->sid;
tsec->osid = tsec->sid;
if (tsec->sid != sid) {
@@ -3114,9 +3106,8 @@ static int selinux_getprocattr(struct ta
char *name, void *value, size_t size)
{
struct task_security_struct *tsec;
- u32 sid;
+ u32 sid, len;
char *context;
- size_t len;
int error;
if (current != p) {
diff -puN security/selinux/include/objsec.h~selinux-binprm-hooks-rework security/selinux/include/objsec.h
--- 25/security/selinux/include/objsec.h~selinux-binprm-hooks-rework Tue Aug 26 12:28:43 2003
+++ 25-akpm/security/selinux/include/objsec.h Tue Aug 26 12:28:43 2003
@@ -21,6 +21,7 @@
#include <linux/list.h>
#include <linux/sched.h>
#include <linux/fs.h>
+#include <linux/binfmts.h>
#include <linux/in.h>
#include "flask.h"
#include "avc.h"
@@ -85,6 +86,13 @@ struct ipc_security_struct {
struct avc_entry_ref avcr; /* reference to permissions */
};
+struct bprm_security_struct {
+ unsigned long magic; /* magic number for this module */
+ struct linux_binprm *bprm; /* back pointer to bprm object */
+ u32 sid; /* SID for transformed process */
+ unsigned char set;
+};
+
extern int inode_security_set_sid(struct inode *inode, u32 sid);
#endif /* _SELINUX_OBJSEC_H_ */
_