Skip to content

L
linux
Commit 43761473 authored by Paul Moore's avatar Paul Moore
1 Browse files
Options

audit: fix a double fetch in audit_log_single_execve_arg() 

There is a double fetch problem in audit_log_single_execve_arg()
where we first check the execve(2) argumnets for any "bad" characters
which would require hex encoding and then re-fetch the arguments for
logging in the audit record[1].  Of course this leaves a window of
opportunity for an unsavory application to munge with the data.

This patch reworks things by only fetching the argument data once[2]
into a buffer where it is scanned and logged into the audit
records(s).  In addition to fixing the double fetch, this patch
improves on the original code in a few other ways: better handling
of large arguments which require encoding, stricter record length
checking, and some performance improvements (completely unverified,
but we got rid of some strlen() calls, that's got to be a good
thing).

As part of the development of this patch, I've also created a basic
regression test for the audit-testsuite, the test can be tracked on
GitHub at the following link:

 * https://github.com/linux-audit/audit-testsuite/issues/25

[1] If you pay careful attention, there is actually a triple fetch
problem due to a strnlen_user() call at the top of the function.

[2] This is a tiny white lie, we do make a call to strnlen_user()
prior to fetching the argument data.  I don't like it, but due to the
way the audit record is structured we really have no choice unless we
copy the entire argument at once (which would require a rather
wasteful allocation).  The good news is that with this patch the
kernel no longer relies on this strnlen_user() value for anything
beyond recording it in the log, we also update it with a trustworthy
value whenever possible.
Reported-by: default avatarPengfei Wang <wpengfeinudt@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 0b7a0fdb
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 168 deletions
kernel/auditsc.c
View file @ 43761473
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/uaccess.h>
#include <uapi/linux/limits.h> #include <uapi/linux/limits.h>
#include "audit.h" #include "audit.h"
...@@ -82,7 +83,8 @@ ...@@ -82,7 +83,8 @@
#define AUDITSC_SUCCESS 1 #define AUDITSC_SUCCESS 1
#define AUDITSC_FAILURE 2 #define AUDITSC_FAILURE 2
/* no execve audit message should be longer than this (userspace limits) */ /* no execve audit message should be longer than this (userspace limits),
* see the note near the top of audit_log_execve_info() about this value */
#define MAX_EXECVE_AUDIT_LEN 7500 #define MAX_EXECVE_AUDIT_LEN 7500
/* max length to print of cmdline/proctitle value during audit */ /* max length to print of cmdline/proctitle value during audit */
...@@ -992,184 +994,178 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid, ...@@ -992,184 +994,178 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
return rc; return rc;
} }
/* static void audit_log_execve_info(struct audit_context *context,
* to_send and len_sent accounting are very loose estimates. We aren't struct audit_buffer **ab)
* really worried about a hard cap to MAX_EXECVE_AUDIT_LEN so much as being
* within about 500 bytes (next page boundary)
*
* why snprintf? an int is up to 12 digits long. if we just assumed when
* logging that a[%d]= was going to be 16 characters long we would be wasting
* space in every audit message. In one 7500 byte message we can log up to
* about 1000 min size arguments. That comes down to about 50% waste of space
* if we didn't do the snprintf to find out how long arg_num_len was.
*/
static int audit_log_single_execve_arg(struct audit_context *context,
struct audit_buffer **ab,
int arg_num,
size_t *len_sent,
const char __user *p,
char *buf)
{ {
char arg_num_len_buf[12]; long len_max;
const char __user *tmp_p = p; long len_rem;
/* how many digits are in arg_num? 5 is the length of ' a=""' */ long len_full;
size_t arg_num_len = snprintf(arg_num_len_buf, 12, "%d", arg_num) + 5; long len_buf;
size_t len, len_left, to_send; long len_abuf;
size_t max_execve_audit_len = MAX_EXECVE_AUDIT_LEN; long len_tmp;
unsigned int i, has_cntl = 0, too_long = 0; bool require_data;
int ret; bool encode;
unsigned int iter;
/* strnlen_user includes the null we don't want to send */ unsigned int arg;
len_left = len = strnlen_user(p, MAX_ARG_STRLEN) - 1; char *buf_head;
char *buf;
/* const char __user *p = (const char __user *)current->mm->arg_start;
* We just created this mm, if we can't find the strings
* we just copied into it something is _very_ wrong. Similar /* NOTE: this buffer needs to be large enough to hold all the non-arg
* for strings that are too long, we should not have created * data we put in the audit record for this argument (see the
* any. * code below) ... at this point in time 96 is plenty */
*/ char abuf[96];
if (WARN_ON_ONCE(len < 0 || len > MAX_ARG_STRLEN - 1)) {
send_sig(SIGKILL, current, 0); /* NOTE: we set MAX_EXECVE_AUDIT_LEN to a rather arbitrary limit, the
return -1; * current value of 7500 is not as important as the fact that it
* is less than 8k, a setting of 7500 gives us plenty of wiggle
* room if we go over a little bit in the logging below */
WARN_ON_ONCE(MAX_EXECVE_AUDIT_LEN > 7500);
len_max = MAX_EXECVE_AUDIT_LEN;
/* scratch buffer to hold the userspace args */
buf_head = kmalloc(MAX_EXECVE_AUDIT_LEN + 1, GFP_KERNEL);
if (!buf_head) {
audit_panic("out of memory for argv string");
return;
} }
buf = buf_head;
/* walk the whole argument looking for non-ascii chars */ audit_log_format(*ab, "argc=%d", context->execve.argc);
len_rem = len_max;
len_buf = 0;
len_full = 0;
require_data = true;
encode = false;
iter = 0;
arg = 0;
do { do {
if (len_left > MAX_EXECVE_AUDIT_LEN) /* NOTE: we don't ever want to trust this value for anything
to_send = MAX_EXECVE_AUDIT_LEN; * serious, but the audit record format insists we
else * provide an argument length for really long arguments,
to_send = len_left; * e.g. > MAX_EXECVE_AUDIT_LEN, so we have no choice but
ret = copy_from_user(buf, tmp_p, to_send); * to use strncpy_from_user() to obtain this value for
/* * recording in the log, although we don't use it
* There is no reason for this copy to be short. We just * anywhere here to avoid a double-fetch problem */
* copied them here, and the mm hasn't been exposed to user- if (len_full == 0)
* space yet. len_full = strnlen_user(p, MAX_ARG_STRLEN) - 1;
*/
if (ret) { /* read more data from userspace */
WARN_ON(1); if (require_data) {
send_sig(SIGKILL, current, 0); /* can we make more room in the buffer? */
return -1; if (buf != buf_head) {
} memmove(buf_head, buf, len_buf);
buf[to_send] = '\0'; buf = buf_head;
has_cntl = audit_string_contains_control(buf, to_send); }
if (has_cntl) {
/* /* fetch as much as we can of the argument */
* hex messages get logged as 2 bytes, so we can only len_tmp = strncpy_from_user(&buf_head[len_buf], p,
* send half as much in each message len_max - len_buf);
*/ if (len_tmp == -EFAULT) {
max_execve_audit_len = MAX_EXECVE_AUDIT_LEN / 2; /* unable to copy from userspace */
break; send_sig(SIGKILL, current, 0);
} goto out;
len_left -= to_send; } else if (len_tmp == (len_max - len_buf)) {
tmp_p += to_send; /* buffer is not large enough */
} while (len_left > 0); require_data = true;
/* NOTE: if we are going to span multiple
len_left = len; * buffers force the encoding so we stand
* a chance at a sane len_full value and
if (len > max_execve_audit_len) * consistent record encoding */
too_long = 1; encode = true;
len_full = len_full * 2;
/* rewalk the argument actually logging the message */ p += len_tmp;
for (i = 0; len_left > 0; i++) { } else {
int room_left; require_data = false;
if (!encode)
if (len_left > max_execve_audit_len) encode = audit_string_contains_control(
to_send = max_execve_audit_len; buf, len_tmp);
else /* try to use a trusted value for len_full */
to_send = len_left; if (len_full < len_max)
len_full = (encode ?
/* do we have space left to send this argument in this ab? */ len_tmp * 2 : len_tmp);
room_left = MAX_EXECVE_AUDIT_LEN - arg_num_len - *len_sent; p += len_tmp + 1;
if (has_cntl) }
room_left -= (to_send * 2); len_buf += len_tmp;
else buf_head[len_buf] = '\0';
room_left -= to_send;
if (room_left < 0) {
*len_sent = 0;
audit_log_end(*ab);
*ab = audit_log_start(context, GFP_KERNEL, AUDIT_EXECVE);
if (!*ab)
return 0;
}
/* /* length of the buffer in the audit record? */
* first record needs to say how long the original string was len_abuf = (encode ? len_buf * 2 : len_buf + 2);
* so we can be sure nothing was lost.
*/
if ((i == 0) && (too_long))
audit_log_format(*ab, " a%d_len=%zu", arg_num,
has_cntl ? 2*len : len);
/*
* normally arguments are small enough to fit and we already
* filled buf above when we checked for control characters
* so don't bother with another copy_from_user
*/
if (len >= max_execve_audit_len)
ret = copy_from_user(buf, p, to_send);
else
ret = 0;
if (ret) {
WARN_ON(1);
send_sig(SIGKILL, current, 0);
return -1;
} }
buf[to_send] = '\0';
/* actually log it */
audit_log_format(*ab, " a%d", arg_num);
if (too_long)
audit_log_format(*ab, "[%d]", i);
audit_log_format(*ab, "=");
if (has_cntl)
audit_log_n_hex(*ab, buf, to_send);
else
audit_log_string(*ab, buf);
p += to_send;
len_left -= to_send;
*len_sent += arg_num_len;
if (has_cntl)
*len_sent += to_send * 2;
else
*len_sent += to_send;
}
/* include the null we didn't log */
return len + 1;
}
static void audit_log_execve_info(struct audit_context *context, /* write as much as we can to the audit log */
struct audit_buffer **ab) if (len_buf > 0) {
{ /* NOTE: some magic numbers here - basically if we
int i, len; * can't fit a reasonable amount of data into the
size_t len_sent = 0; * existing audit buffer, flush it and start with
const char __user *p; * a new buffer */
char *buf; if ((sizeof(abuf) + 8) > len_rem) {
len_rem = len_max;
audit_log_end(*ab);
*ab = audit_log_start(context,
GFP_KERNEL, AUDIT_EXECVE);
if (!*ab)
goto out;
}
p = (const char __user *)current->mm->arg_start; /* create the non-arg portion of the arg record */
len_tmp = 0;
if (require_data || (iter > 0) ||
((len_abuf + sizeof(abuf)) > len_rem)) {
if (iter == 0) {
len_tmp += snprintf(&abuf[len_tmp],
sizeof(abuf) - len_tmp,
" a%d_len=%lu",
arg, len_full);
}
len_tmp += snprintf(&abuf[len_tmp],
sizeof(abuf) - len_tmp,
" a%d[%d]=", arg, iter++);
} else
len_tmp += snprintf(&abuf[len_tmp],
sizeof(abuf) - len_tmp,
" a%d=", arg);
WARN_ON(len_tmp >= sizeof(abuf));
abuf[sizeof(abuf) - 1] = '\0';
/* log the arg in the audit record */
audit_log_format(*ab, "%s", abuf);
len_rem -= len_tmp;
len_tmp = len_buf;
if (encode) {
if (len_abuf > len_rem)
len_tmp = len_rem / 2; /* encoding */
audit_log_n_hex(*ab, buf, len_tmp);
len_rem -= len_tmp * 2;
len_abuf -= len_tmp * 2;
} else {
if (len_abuf > len_rem)
len_tmp = len_rem - 2; /* quotes */
audit_log_n_string(*ab, buf, len_tmp);
len_rem -= len_tmp + 2;
/* don't subtract the "2" because we still need
* to add quotes to the remaining string */
len_abuf -= len_tmp;
}
len_buf -= len_tmp;
buf += len_tmp;
}
audit_log_format(*ab, "argc=%d", context->execve.argc); /* ready to move to the next argument? */
if ((len_buf == 0) && !require_data) {
arg++;
iter = 0;
len_full = 0;
require_data = true;
encode = false;
}
} while (arg < context->execve.argc);
/* /* NOTE: the caller handles the final audit_log_end() call */
* we need some kernel buffer to hold the userspace args. Just
* allocate one big one rather than allocating one of the right size
* for every single argument inside audit_log_single_execve_arg()
* should be <8k allocation so should be pretty safe.
*/
buf = kmalloc(MAX_EXECVE_AUDIT_LEN + 1, GFP_KERNEL);
if (!buf) {
audit_panic("out of memory for argv string");
return;
}
for (i = 0; i < context->execve.argc; i++) { out:
len = audit_log_single_execve_arg(context, ab, i, kfree(buf_head);
&len_sent, p, buf);
if (len <= 0)
break;
p += len;
}
kfree(buf);
} }
static void show_special(struct audit_context *context, int *call_panic) static void show_special(struct audit_context *context, int *call_panic)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7