diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-28 16:27:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-28 16:27:28 -0700 |
| commit | cc7acad135b7228b56977867afb07d3d54f0cdd3 (patch) | |
| tree | 8934c8b0f6aac4a01488c59c45b8dc55c64cc721 /include | |
| parent | c9fd56b34efd06a031cbc918d288f09e38173ff9 (diff) | |
| parent | 8d3b7dce8622919da5c5822ef7338d6604c9fe6e (diff) | |
Merge branch 'bpf_trace_printk-percent-s'
Alexei Starovoitov says:
====================
support for '%s' in bpf_trace_printk
v2->v3:
fix the comment to mention that strncpy_from_unsafe() returns
the length of the string including the trailing NUL.
v1->v2:
patch 1: generalize FETCH_FUNC_NAME(memory, string) into
strncpy_from_unsafe()
patch 2: use it in bpf_trace_printk
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/uaccess.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index ae572c138607..d6f2c2c5b043 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -129,4 +129,6 @@ extern long __probe_kernel_read(void *dst, const void *src, size_t size); extern long notrace probe_kernel_write(void *dst, const void *src, size_t size); extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size); +extern long strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count); + #endif /* __LINUX_UACCESS_H__ */ |