From: Stephen Smalley Eliminate selinux_task_ctxid since it duplicates selinux_task_get_sid. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton --- include/linux/selinux.h | 15 --------------- kernel/auditsc.c | 2 +- security/selinux/exports.c | 9 --------- 3 files changed, 1 insertion(+), 25 deletions(-) diff -puN include/linux/selinux.h~selinux-eliminate-selinux_task_ctxid include/linux/selinux.h --- a/include/linux/selinux.h~selinux-eliminate-selinux_task_ctxid +++ a/include/linux/selinux.h @@ -70,16 +70,6 @@ int selinux_audit_rule_match(u32 ctxid, 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 * @ctxid: security context ID to be converted. * @ctx: address of context string to be returned @@ -166,11 +156,6 @@ static inline void selinux_audit_set_cal 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) { *ctx = NULL; diff -puN kernel/auditsc.c~selinux-eliminate-selinux_task_ctxid kernel/auditsc.c --- a/kernel/auditsc.c~selinux-eliminate-selinux_task_ctxid +++ a/kernel/auditsc.c @@ -337,7 +337,7 @@ static int audit_filter_rules(struct tas logged upon error */ if (f->se_rule) { if (need_sid) { - selinux_task_ctxid(tsk, &sid); + selinux_get_task_sid(tsk, &sid); need_sid = 0; } result = selinux_audit_rule_match(sid, f->type, diff -puN security/selinux/exports.c~selinux-eliminate-selinux_task_ctxid security/selinux/exports.c --- a/security/selinux/exports.c~selinux-eliminate-selinux_task_ctxid +++ a/security/selinux/exports.c @@ -21,15 +21,6 @@ #include "security.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) { if (selinux_enabled) _