From: David Long <dave.long@linaro.org>
To: stable@vger.kernel.org,
Russell King - ARM Linux <linux@armlinux.org.uk>,
Florian Fainelli <f.fainelli@gmail.com>,
Julien Thierry <julien.thierry@arm.com>,
Tony Lindgren <tony@atomide.com>,
Marc Zyngier <marc.zyngier@arm.com>,
Mark Rutland <mark.rutland@arm.com>
Cc: Greg KH <gregkh@linuxfoundation.org>, Mark Brown <broonie@kernel.org>
Subject: [PATCH 4.14 05/17] ARM: 8793/1: signal: replace __put_user_error with __put_user
Date: Thu, 10 Jan 2019 12:51:38 -0500 [thread overview]
Message-ID: <20190110175150.5239-6-dave.long@linaro.org> (raw)
In-Reply-To: <20190110175150.5239-1-dave.long@linaro.org>
From: Julien Thierry <julien.thierry@arm.com>
Commit 18ea66bd6e7a95bdc598223d72757190916af28b upstream.
With Spectre-v1.1 mitigations, __put_user_error is pointless. In an attempt
to remove it, replace its references in frame setups with __put_user.
Signed-off-by: Julien Thierry <julien.thierry@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David A. Long <dave.long@linaro.org>
---
arch/arm/kernel/signal.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 1eb83ee7e1cc..02e6b6dfffa7 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -344,7 +344,7 @@ setup_sigframe(struct sigframe __user *sf, struct pt_regs *regs, sigset_t *set)
if (err == 0)
err |= preserve_vfp_context(&aux->vfp);
#endif
- __put_user_error(0, &aux->end_magic, err);
+ err |= __put_user(0, &aux->end_magic);
return err;
}
@@ -476,7 +476,7 @@ setup_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
/*
* Set uc.uc_flags to a value which sc.trap_no would never have.
*/
- __put_user_error(0x5ac3c35a, &frame->uc.uc_flags, err);
+ err = __put_user(0x5ac3c35a, &frame->uc.uc_flags);
err |= setup_sigframe(frame, regs, set);
if (err == 0)
@@ -496,8 +496,8 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
err |= copy_siginfo_to_user(&frame->info, &ksig->info);
- __put_user_error(0, &frame->sig.uc.uc_flags, err);
- __put_user_error(NULL, &frame->sig.uc.uc_link, err);
+ err |= __put_user(0, &frame->sig.uc.uc_flags);
+ err |= __put_user(NULL, &frame->sig.uc.uc_link);
err |= __save_altstack(&frame->sig.uc.uc_stack, regs->ARM_sp);
err |= setup_sigframe(&frame->sig, regs, set);
--
2.17.1
next prev parent reply other threads:[~2019-01-10 17:52 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 17:51 [PATCH 4.14 00/17] V4.14 backport of more 32-bit arm spectre patches David Long
2019-01-10 17:51 ` [PATCH 4.14 01/17] ARM: 8789/1: signal: copy registers using __copy_to_user() David Long
2019-01-10 17:51 ` [PATCH 4.14 02/17] ARM: 8790/1: signal: always use __copy_to_user to save iwmmxt context David Long
2019-01-10 17:51 ` [PATCH 4.14 03/17] ARM: 8791/1: vfp: use __copy_to_user() when saving VFP state David Long
2019-01-10 17:51 ` [PATCH 4.14 04/17] ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user() David Long
2019-01-10 17:51 ` David Long [this message]
2019-01-10 17:51 ` [PATCH 4.14 06/17] ARM: 8794/1: uaccess: Prevent speculative use of the current addr_limit David Long
2019-01-10 17:51 ` [PATCH 4.14 07/17] ARM: 8795/1: spectre-v1.1: use put_user() for __put_user() David Long
2019-01-10 17:51 ` [PATCH 4.14 08/17] ARM: 8796/1: spectre-v1,v1.1: provide helpers for address sanitization David Long
2019-01-10 17:51 ` [PATCH 4.14 09/17] ARM: 8797/1: spectre-v1.1: harden __copy_to_user David Long
2019-01-10 17:51 ` [PATCH 4.14 10/17] ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc David Long
2019-01-10 17:51 ` [PATCH 4.14 11/17] ARM: make lookup_processor_type() non-__init David Long
2019-01-10 17:51 ` [PATCH 4.14 12/17] ARM: split out processor lookup David Long
2019-01-10 17:51 ` [PATCH 4.14 13/17] ARM: clean up per-processor check_bugs method call David Long
2019-01-10 17:51 ` [PATCH 4.14 14/17] ARM: add PROC_VTABLE and PROC_TABLE macros David Long
2019-01-10 17:51 ` [PATCH 4.14 15/17] ARM: spectre-v2: per-CPU vtables to work around big.Little systems David Long
2019-01-10 17:51 ` [PATCH 4.14 16/17] ARM: ensure that processor vtables is not lost after boot David Long
2019-01-10 17:51 ` [PATCH 4.14 17/17] ARM: fix the cockup in the previous patch David Long
2019-01-15 15:45 ` [PATCH 4.14 00/17] V4.14 backport of more 32-bit arm spectre patches Greg KH
2019-01-15 16:07 ` David Long
2019-01-15 16:30 ` Greg KH
2019-01-15 16:39 ` David Long
2019-01-15 17:06 ` Russell King - ARM Linux admin
2019-01-15 17:19 ` Greg KH
2019-01-16 19:27 ` David Long
2019-01-16 19:33 ` Greg KH
2019-01-16 19:40 ` David Long
2019-01-16 19:48 ` Greg KH
2019-01-16 19:49 ` Russell King - ARM Linux admin
2019-01-18 16:07 ` Greg KH
2019-01-18 20:24 ` David Long
2019-01-19 8:08 ` Greg KH
2019-01-19 9:56 ` Russell King - ARM Linux admin
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=20190110175150.5239-6-dave.long@linaro.org \
--to=dave.long@linaro.org \
--cc=broonie@kernel.org \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=julien.thierry@arm.com \
--cc=linux@armlinux.org.uk \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=stable@vger.kernel.org \
--cc=tony@atomide.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).