adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] fix deadlock in audit_log_task_context()

Browse source 
GFP_KERNEL allocations in non-blocking context; fixed by killing
an idiotic use of security_getprocattr().

Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2007-03-12 16:17:42 +00:00 committed by Linus Torvalds
parent baab1087c6
commit c4823bce03
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
kernel/auditsc.c
View file

@ -739,28 +739,26 @@ static inline void audit_free_context(struct audit_context *context)
void audit_log_task_context(struct audit_buffer *ab) void audit_log_task_context(struct audit_buffer *ab)
{ {
char *ctx = NULL; char *ctx = NULL;
ssize_t len = 0; unsigned len;
int error;
u32 sid;
len = security_getprocattr(current, "current", NULL, 0); selinux_get_task_sid(current, &sid);
if (len < 0) { if (!sid)
if (len != -EINVAL) return;
error = selinux_sid_to_string(sid, &ctx, &len);
if (error) {
if (error != -EINVAL)
goto error_path; goto error_path;
return; return;
} }
ctx = kmalloc(len, GFP_KERNEL);
if (!ctx)
goto error_path;
len = security_getprocattr(current, "current", ctx, len);
if (len < 0 )
goto error_path;
audit_log_format(ab, " subj=%s", ctx); audit_log_format(ab, " subj=%s", ctx);
kfree(ctx);
return; return;
error_path: error_path:
kfree(ctx);
audit_panic("error in audit_log_task_context"); audit_panic("error in audit_log_task_context");
return; return;
} }