Messages in this thread | | | Date | Mon, 19 Nov 2012 14:14:58 -0800 | From | Andrew Morton <> | Subject | Re: [PATCH] audit: catch possible NULL audit buffers |
| |
On Mon, 19 Nov 2012 14:00:51 -0800 Kees Cook <keescook@chromium.org> wrote:
> It's possible for audit_log_start() to return NULL. Handle it in the > various callers. > > ... > > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -272,6 +272,8 @@ static int audit_log_config_change(char *function_name, int new, int old, > int rc = 0; > > ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE); > + if (unlikely(!ab)) > + return rc;
Returning success here looks suspicious. audit_do_config_change() will fail to take its wtf-just-happened action (which audit_log_config_change() duplicates, btw).
Meanwhile audit_receive_msg() is off living in a happy land where nothing ever goes wrong.
> audit_log_format(ab, "%s=%d old=%d auid=%u ses=%u", function_name, new, > old, from_kuid(&init_user_ns, loginuid), sessionid); > if (sid) { > @@ -619,6 +621,8 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type, > } > > *ab = audit_log_start(NULL, GFP_KERNEL, msg_type); > + if (unlikely(!*ab)) > + return rc;
Also looks fishy.
> audit_log_format(*ab, "pid=%d uid=%u auid=%u ses=%u", > task_tgid_vnr(current), > from_kuid(&init_user_ns, current_uid()), > > ... >
| |