Commit 1f65c13e authored by AKASHI Takahiro's avatar AKASHI Takahiro Committed by Catalin Marinas

arm64: avoid multiple evaluation of ptr in get_user/put_user()

get_user() is defined as a function macro in arm64, and trace_get_user()
calls it as followed:
     get_user(ch, ptr++);
Since the second parameter occurs twice in the definition, 'ptr++' is
unexpectedly evaluated twice and trace_get_user() will generate a bogus
string from user-provided one. As a result, some ftrace sysfs operations,
like "echo FUNCNAME > set_ftrace_filter," hit this case and eventually fail.
This patch fixes the issue both in get_user() and put_user().
Signed-off-by: default avatarAKASHI Takahiro <takahiro.akashi@linaro.org>
[catalin.marinas@arm.com: added __user type annotation and s/optr/__p/]
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 25804e6a
...@@ -166,9 +166,10 @@ do { \ ...@@ -166,9 +166,10 @@ do { \
#define get_user(x, ptr) \ #define get_user(x, ptr) \
({ \ ({ \
__typeof__(*(ptr)) __user *__p = (ptr); \
might_fault(); \ might_fault(); \
access_ok(VERIFY_READ, (ptr), sizeof(*(ptr))) ? \ access_ok(VERIFY_READ, __p, sizeof(*__p)) ? \
__get_user((x), (ptr)) : \ __get_user((x), __p) : \
((x) = 0, -EFAULT); \ ((x) = 0, -EFAULT); \
}) })
...@@ -227,9 +228,10 @@ do { \ ...@@ -227,9 +228,10 @@ do { \
#define put_user(x, ptr) \ #define put_user(x, ptr) \
({ \ ({ \
__typeof__(*(ptr)) __user *__p = (ptr); \
might_fault(); \ might_fault(); \
access_ok(VERIFY_WRITE, (ptr), sizeof(*(ptr))) ? \ access_ok(VERIFY_WRITE, __p, sizeof(*__p)) ? \
__put_user((x), (ptr)) : \ __put_user((x), __p) : \
-EFAULT; \ -EFAULT; \
}) })
......
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