mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 13:03:25 +01:00
797311bce5
Fix to record 0-length data to data_loc in fetch_store_string*() if it fails
to get the string data.
Currently those expect that the data_loc is updated by store_trace_args() if
it returns the error code. However, that does not work correctly if the
argument is an array of strings. In that case, store_trace_args() only clears
the first entry of the array (which may have no error) and leaves other
entries. So it should be cleared by fetch_store_string*() itself.
Also, 'dyndata' and 'maxlen' in store_trace_args() should be updated
only if it is used (ret > 0 and argument is a dynamic data.)
Link: https://lore.kernel.org/all/168908496683.123124.4761206188794205601.stgit@devnote2/
Fixes: 40b53b7718 ("tracing: probeevent: Add array type support")
Cc: stable@vger.kernel.org
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
119 lines
2.9 KiB
C
119 lines
2.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __TRACE_PROBE_KERNEL_H_
|
|
#define __TRACE_PROBE_KERNEL_H_
|
|
|
|
/*
|
|
* This depends on trace_probe.h, but can not include it due to
|
|
* the way trace_probe_tmpl.h is used by trace_kprobe.c and trace_eprobe.c.
|
|
* Which means that any other user must include trace_probe.h before including
|
|
* this file.
|
|
*/
|
|
/* Return the length of string -- including null terminal byte */
|
|
static nokprobe_inline int
|
|
fetch_store_strlen_user(unsigned long addr)
|
|
{
|
|
const void __user *uaddr = (__force const void __user *)addr;
|
|
|
|
return strnlen_user_nofault(uaddr, MAX_STRING_SIZE);
|
|
}
|
|
|
|
/* Return the length of string -- including null terminal byte */
|
|
static nokprobe_inline int
|
|
fetch_store_strlen(unsigned long addr)
|
|
{
|
|
int ret, len = 0;
|
|
u8 c;
|
|
|
|
#ifdef CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
|
|
if (addr < TASK_SIZE)
|
|
return fetch_store_strlen_user(addr);
|
|
#endif
|
|
|
|
do {
|
|
ret = copy_from_kernel_nofault(&c, (u8 *)addr + len, 1);
|
|
len++;
|
|
} while (c && ret == 0 && len < MAX_STRING_SIZE);
|
|
|
|
return (ret < 0) ? ret : len;
|
|
}
|
|
|
|
static nokprobe_inline void set_data_loc(int ret, void *dest, void *__dest, void *base)
|
|
{
|
|
if (ret < 0)
|
|
ret = 0;
|
|
*(u32 *)dest = make_data_loc(ret, __dest - base);
|
|
}
|
|
|
|
/*
|
|
* Fetch a null-terminated string from user. Caller MUST set *(u32 *)buf
|
|
* with max length and relative data location.
|
|
*/
|
|
static nokprobe_inline int
|
|
fetch_store_string_user(unsigned long addr, void *dest, void *base)
|
|
{
|
|
const void __user *uaddr = (__force const void __user *)addr;
|
|
int maxlen = get_loc_len(*(u32 *)dest);
|
|
void *__dest;
|
|
long ret;
|
|
|
|
if (unlikely(!maxlen))
|
|
return -ENOMEM;
|
|
|
|
__dest = get_loc_data(dest, base);
|
|
|
|
ret = strncpy_from_user_nofault(__dest, uaddr, maxlen);
|
|
set_data_loc(ret, dest, __dest, base);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Fetch a null-terminated string. Caller MUST set *(u32 *)buf with max
|
|
* length and relative data location.
|
|
*/
|
|
static nokprobe_inline int
|
|
fetch_store_string(unsigned long addr, void *dest, void *base)
|
|
{
|
|
int maxlen = get_loc_len(*(u32 *)dest);
|
|
void *__dest;
|
|
long ret;
|
|
|
|
#ifdef CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
|
|
if ((unsigned long)addr < TASK_SIZE)
|
|
return fetch_store_string_user(addr, dest, base);
|
|
#endif
|
|
|
|
if (unlikely(!maxlen))
|
|
return -ENOMEM;
|
|
|
|
__dest = get_loc_data(dest, base);
|
|
|
|
/*
|
|
* Try to get string again, since the string can be changed while
|
|
* probing.
|
|
*/
|
|
ret = strncpy_from_kernel_nofault(__dest, (void *)addr, maxlen);
|
|
set_data_loc(ret, dest, __dest, base);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static nokprobe_inline int
|
|
probe_mem_read_user(void *dest, void *src, size_t size)
|
|
{
|
|
const void __user *uaddr = (__force const void __user *)src;
|
|
|
|
return copy_from_user_nofault(dest, uaddr, size);
|
|
}
|
|
|
|
static nokprobe_inline int
|
|
probe_mem_read(void *dest, void *src, size_t size)
|
|
{
|
|
#ifdef CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
|
|
if ((unsigned long)src < TASK_SIZE)
|
|
return probe_mem_read_user(dest, src, size);
|
|
#endif
|
|
return copy_from_kernel_nofault(dest, src, size);
|
|
}
|
|
|
|
#endif /* __TRACE_PROBE_KERNEL_H_ */
|