From: "tip-bot2 for Lukas Bulwahn" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>,
Borislav Petkov <bp@suse.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/cleanups] x86/ia32_signal: Propagate __user annotation properly
Date: Fri, 11 Dec 2020 18:54:20 -0000 [thread overview]
Message-ID: <160771286080.3364.15021065980824456713.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201207124141.21859-1-lukas.bulwahn@gmail.com>
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 9a02fd8b19247e80e2354a227b6e2392e8fae78a
Gitweb: https://git.kernel.org/tip/9a02fd8b19247e80e2354a227b6e2392e8fae78a
Author: Lukas Bulwahn <lukas.bulwahn@gmail.com>
AuthorDate: Mon, 07 Dec 2020 13:41:41 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Fri, 11 Dec 2020 19:44:31 +01:00
x86/ia32_signal: Propagate __user annotation properly
Commit
57d563c82925 ("x86: ia32_setup_rt_frame(): consolidate uaccess areas")
dropped a __user annotation in a cast when refactoring __put_user() to
unsafe_put_user().
Hence, since then, sparse warns in arch/x86/ia32/ia32_signal.c:350:9:
warning: cast removes address space '__user' of expression
warning: incorrect type in argument 1 (different address spaces)
expected void const volatile [noderef] __user *ptr
got unsigned long long [usertype] *
Add the __user annotation to restore the propagation of address spaces.
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20201207124141.21859-1-lukas.bulwahn@gmail.com
---
arch/x86/ia32/ia32_signal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index 81cf223..5e3d9b7 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -347,7 +347,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
*/
unsafe_put_user(*((u64 *)&code), (u64 __user *)frame->retcode, Efault);
unsafe_put_sigcontext32(&frame->uc.uc_mcontext, fp, regs, set, Efault);
- unsafe_put_user(*(__u64 *)set, (__u64 *)&frame->uc.uc_sigmask, Efault);
+ unsafe_put_user(*(__u64 *)set, (__u64 __user *)&frame->uc.uc_sigmask, Efault);
user_access_end();
if (__copy_siginfo_to_user32(&frame->info, &ksig->info))
prev parent reply other threads:[~2020-12-11 20:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-07 12:41 [PATCH] x86: ia32_setup_rt_frame(): propagate __user annotations properly Lukas Bulwahn
2020-12-07 12:41 ` Lukas Bulwahn
2020-12-11 18:47 ` Borislav Petkov
2020-12-11 18:47 ` Borislav Petkov
2020-12-11 18:55 ` Lukas Bulwahn
2020-12-11 18:55 ` Lukas Bulwahn
2020-12-11 19:02 ` Borislav Petkov
2020-12-11 19:02 ` Borislav Petkov
2020-12-11 18:54 ` tip-bot2 for Lukas Bulwahn [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160771286080.3364.15021065980824456713.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=lukas.bulwahn@gmail.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.