glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change type of injected rval to kernel_long_t

Browse Source 
* defs.h (struct inject_data): Change type of rval field to
kernel_ulong_t.
* filter_qualify.c (parse_inject_token): Use string_to_kulong instead of
string_to_uint for rval parsing.  Warn if retval is clipped in compat
personality.
This commit is contained in:
Eugene Syromyatnikov 2018-02-01 12:34:05 +01:00 committed by Dmitry V. Levin
parent b06199a8b9
commit b21d81db04
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defs.h
View File

@ -181,7 +181,7 @@ typedef struct ioctlent {
struct inject_data { struct inject_data {
uint16_t flags; uint16_t flags;
uint16_t signo; uint16_t signo;
int rval; kernel_long_t rval;
}; };
struct inject_opts { struct inject_opts {

18
filter_qualify.c
View File

@ -83,7 +83,7 @@ parse_inject_token(const char *const token, struct inject_opts *const fopts,
const bool fault_tokens_only) const bool fault_tokens_only)
{ {
const char *val; const char *val;
int intval; kernel_long_t intval;
if ((val = STR_STRIP_PREFIX(token, "when=")) != token) { if ((val = STR_STRIP_PREFIX(token, "when=")) != token) {
/* /*
@ -129,9 +129,23 @@ parse_inject_token(const char *const token, struct inject_opts *const fopts,
&& (val = STR_STRIP_PREFIX(token, "retval=")) != token) { && (val = STR_STRIP_PREFIX(token, "retval=")) != token) {
if (fopts->data.flags & INJECT_F_RETVAL) if (fopts->data.flags & INJECT_F_RETVAL)
return false; return false;
intval = string_to_uint(val); intval = string_to_kulong(val);
if (intval < 0) if (intval < 0)
return false; return false;
#if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG && !HAVE_ARCH_DEDICATED_ERR_REG
if ((int) intval != intval)
error_msg("Injected return value %" PRI_kld " will be"
" clipped to %d in compat personality",
intval, (int) intval);
if ((int) intval < 0 && (int) intval >= -4095)
error_msg("Inadvertent injection of error %d is"
" possible in compat personality for"
" retval=%" PRI_kld,
-(int) intval, intval);
#endif
fopts->data.rval = intval; fopts->data.rval = intval;
fopts->data.flags |= INJECT_F_RETVAL; fopts->data.flags |= INJECT_F_RETVAL;
} else if (!fault_tokens_only } else if (!fault_tokens_only