arm64: avoid multiple evaluation of ptr in get_user/put_user()
authorAKASHI Takahiro <takahiro.akashi@linaro.org>
Tue, 24 Sep 2013 09:00:50 +0000 (10:00 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 9 Jun 2014 10:05:40 +0000 (11:05 +0100)
commit4d1e99cd1602a17035f53d6e420e4c18f4125a3b
treee45fbb707914c4c1366e7f34eddca41e8f69f868
parent8c800e8ee95a1396901f694a8d9dcf880efdd43c
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: AKASHI Takahiro <takahiro.akashi@linaro.org>
[catalin.marinas@arm.com: added __user type annotation and s/optr/__p/]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 1f65c13efef69b6dc908e588f91a133641d8475c)
Signed-off-by: Mark Brown <broonie@linaro.org>
Conflicts:
arch/arm64/include/asm/uaccess.h
arch/arm64/include/asm/uaccess.h