Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] selinux: eliminate selinux_task_ctxid

Browse source 
Eliminate selinux_task_ctxid since it duplicates selinux_task_get_sid.

Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Stephen Smalley 2006-09-25 23:31:56 -07:00 committed by Linus Torvalds
parent 89fa30242f
commit 62bac0185a
3 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/linux/selinux.h
View file

@ -69,16 +69,6 @@ int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
*/ */
void selinux_audit_set_callback(int (*callback)(void)); void selinux_audit_set_callback(int (*callback)(void));
/**
* selinux_task_ctxid - determine a context ID for a process.
* @tsk: the task object
* @ctxid: ID value returned via this
*
* On return, ctxid will contain an ID for the context. This value
* should only be used opaquely.
*/
void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid);
/** /**
* selinux_ctxid_to_string - map a security context ID to a string * selinux_ctxid_to_string - map a security context ID to a string
* @ctxid: security context ID to be converted. * @ctxid: security context ID to be converted.
@ -166,11 +156,6 @@ static inline void selinux_audit_set_callback(int (*callback)(void))
return; return;
} }
static inline void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid)
{
*ctxid = 0;
}
static inline int selinux_ctxid_to_string(u32 ctxid, char **ctx, u32 *ctxlen) static inline int selinux_ctxid_to_string(u32 ctxid, char **ctx, u32 *ctxlen)
{ {
*ctx = NULL; *ctx = NULL;

2
kernel/auditsc.c
View file

@ -385,7 +385,7 @@ static int audit_filter_rules(struct task_struct *tsk,
logged upon error */ logged upon error */
if (f->se_rule) { if (f->se_rule) {
if (need_sid) { if (need_sid) {
selinux_task_ctxid(tsk, &sid); selinux_get_task_sid(tsk, &sid);
need_sid = 0; need_sid = 0;
} }
result = selinux_audit_rule_match(sid, f->type, result = selinux_audit_rule_match(sid, f->type,

9
security/selinux/exports.c
View file

@ -21,15 +21,6 @@
#include "security.h" #include "security.h"
#include "objsec.h" #include "objsec.h"
void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid)
{
struct task_security_struct *tsec = tsk->security;
if (selinux_enabled)
*ctxid = tsec->sid;
else
*ctxid = 0;
}
int selinux_ctxid_to_string(u32 ctxid, char **ctx, u32 *ctxlen) int selinux_ctxid_to_string(u32 ctxid, char **ctx, u32 *ctxlen)
{ {
if (selinux_enabled) if (selinux_enabled)