From patchwork Thu Feb 14 02:10:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 158274 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp793640jaa; Wed, 13 Feb 2019 18:10:26 -0800 (PST) X-Received: by 2002:a0c:b00b:: with SMTP id k11mr992400qvc.237.1550110226526; Wed, 13 Feb 2019 18:10:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550110226; cv=none; d=google.com; s=arc-20160816; b=wAPg0GJK7oC+gMap+JXdjhIQegFyJkitex0Oa81GOAdaXdJRJc8dipcvoCadl+5rOx 48Jw7a92kO/dOr3e4tVdUqAQ5PvYYxq3q3JOrV3bGVPBfDkW9vVZKi4kcutqIRqG3yON 4hKhOmzGp5E2GsFZOC6TlXOhrvkleoNLAEE+8tee/+IRK25pYJaFsJ67gImF/vbS1ATz q71OsjyEfzOcTbZBam76QaTQFNAv00BeeuYrgrEF1uZimuRBcq0b0hBAiIDySZ4+hyvz Zajff8JZItvKH5Y6ix6HF1vzhIuntLUSkhFkhFL9cOFC3BokVkh806IRUaSVg/Tj7Nqj 2kkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JdLRrZPibA2dIcwMA1KY3ab0IY+IQcbm99bqdyt8hkw=; b=XpSZ+YC8AtcHjqRRyo05pif+yhn+1KhksNMFA9tVgSM1h4h9W3bIS3vQsj1PoJufDi +2J6etwW8qZIwXcFihT18xM5A4gbtaMwZo4bBXbGqj42yDQde9zF5HR03kDxVYjlYuAH VvzoPHvqo0tRc90IrBN+jxXFGILFu6dxiExXXrXJIlYNAFfM0uDN+ZiwVh5Hn+b5tlJQ 96noC/riFnva198foCvpbWiBMfn8rH0D2ehT+myeR2VaK8TQ8HfAVvk5uc6Vd+ynRreO BbZjlQ5GV07ljOctDhrwLb94dD2ECsU5nrVZTQL3kjLbySGKwZbnrbl1G0FnDIrDOYTh PI/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vy1LxriG; spf=pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=dave.long@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 68sor1272793qte.29.2019.02.13.18.10.26 for (Google Transport Security); Wed, 13 Feb 2019 18:10:26 -0800 (PST) Received-SPF: pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vy1LxriG; spf=pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=dave.long@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JdLRrZPibA2dIcwMA1KY3ab0IY+IQcbm99bqdyt8hkw=; b=vy1LxriGrYRghnYRsC715zl3NC+jrgX/rz9dTo92LqbVzYHrQ+XA9/4h4nOHn230Y9 lrcKF44hCZO/oPbJf3n7sFe0tAy3yxFpwkOc2NJYUimwXy1DW3G+yakdkd8bgP7APe4f QPTTO6mVBga629i5cVvTlcFFpp/7l5eqjpZDW/WAHbcCZhQ25lcdKfK/ALiaHczq8SIS eSF/lZFRyGFuH1AKIrxww3uqElkF8JFjtqgqcgmAGcw0d0md9QT9mHEIxlgQ2WtCcGVs g7iYeINagArzCl5DEZdCkJc/hc70MWS1l5DLzdz3KP/0INSK/nrjy86thsaZZxytESAz Rncg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JdLRrZPibA2dIcwMA1KY3ab0IY+IQcbm99bqdyt8hkw=; b=msQmmJ9WjZRiXvBO8MhCkCeXkmeyg1tOrw7uSZTYdWQ1qKv/4/koIdgHciW06E4zPL hJtSZLhxcFuUt4g7aVEt7XcD1H/F9MZyUKnzwwgsttrMgUMmI5IwuY4bza0QiQUWdPqT +6jnGEFk+Dkoj2ZvMo0Dh4oOGsaY0JXDPTyWGJ6+3JD03+NkVj+esrTaSoBCinyk8n7B xG9Yy/2c100y2/mJUPx/bpvg7akTwDNz1MOzQph6ZiiCXiZeYpHDF7xppFzlkr7czkWM hvhmSy5sA8YoZvaDsfEh2kfm8DJtREgC2Ex+tVR8QZlbIMHOuesVr6tY9mdytN3dLyl6 27lg== X-Gm-Message-State: AHQUAuaFbA1pJe7plRzycSLu8X4+Sbnqryzl4O/1c1H4O/LBDnRijm/Y cabB4xKOgNAxxionEvOonfKVV2TZ X-Google-Smtp-Source: AHgI3Ia+8KHBDqKJ+YiKJMA1T19oD1YZ4wEPTzG0Eq995VT34n7Uy/EudvIYqUwLCW5J3kN/4q+ykw== X-Received: by 2002:aed:3ae4:: with SMTP id o91mr1041056qte.251.1550110226151; Wed, 13 Feb 2019 18:10:26 -0800 (PST) Return-Path: Received: from localhost.localdomain (pool-72-71-243-63.cncdnh.fast00.myfairpoint.net. [72.71.243.63]) by smtp.googlemail.com with ESMTPSA id d63sm1091575qka.22.2019.02.13.18.10.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 18:10:25 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Julien Thierry , Tony Lindgren , Marc Zyngier , Greg KH , Mark Rutland Cc: Will Deacon , Mark Brown , linux-kernel@vger.kernel.org Subject: [PATCH 4.14 V2 01/17] ARM: 8789/1: signal: copy registers using __copy_to_user() Date: Wed, 13 Feb 2019 21:10:06 -0500 Message-Id: <20190214021022.5313-2-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190214021022.5313-1-dave.long@linaro.org> References: <20190214021022.5313-1-dave.long@linaro.org> From: Julien Thierry Commit 5ca451cf6ed04443774bbb7ee45332dafa42e99f upstream. When saving the ARM integer registers, use __copy_to_user() to copy them into user signal frame, rather than __put_user_error(). This has the benefit of disabling/enabling PAN once for the whole copy intead of once per write. Signed-off-by: Julien Thierry Signed-off-by: Russell King Signed-off-by: David A. Long --- arch/arm/kernel/signal.c | 49 ++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 22 deletions(-) -- 2.17.1 diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index cdfe52b15a0a..1dc1f39825b6 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -296,30 +296,35 @@ static int setup_sigframe(struct sigframe __user *sf, struct pt_regs *regs, sigset_t *set) { struct aux_sigframe __user *aux; + struct sigcontext context; int err = 0; - __put_user_error(regs->ARM_r0, &sf->uc.uc_mcontext.arm_r0, err); - __put_user_error(regs->ARM_r1, &sf->uc.uc_mcontext.arm_r1, err); - __put_user_error(regs->ARM_r2, &sf->uc.uc_mcontext.arm_r2, err); - __put_user_error(regs->ARM_r3, &sf->uc.uc_mcontext.arm_r3, err); - __put_user_error(regs->ARM_r4, &sf->uc.uc_mcontext.arm_r4, err); - __put_user_error(regs->ARM_r5, &sf->uc.uc_mcontext.arm_r5, err); - __put_user_error(regs->ARM_r6, &sf->uc.uc_mcontext.arm_r6, err); - __put_user_error(regs->ARM_r7, &sf->uc.uc_mcontext.arm_r7, err); - __put_user_error(regs->ARM_r8, &sf->uc.uc_mcontext.arm_r8, err); - __put_user_error(regs->ARM_r9, &sf->uc.uc_mcontext.arm_r9, err); - __put_user_error(regs->ARM_r10, &sf->uc.uc_mcontext.arm_r10, err); - __put_user_error(regs->ARM_fp, &sf->uc.uc_mcontext.arm_fp, err); - __put_user_error(regs->ARM_ip, &sf->uc.uc_mcontext.arm_ip, err); - __put_user_error(regs->ARM_sp, &sf->uc.uc_mcontext.arm_sp, err); - __put_user_error(regs->ARM_lr, &sf->uc.uc_mcontext.arm_lr, err); - __put_user_error(regs->ARM_pc, &sf->uc.uc_mcontext.arm_pc, err); - __put_user_error(regs->ARM_cpsr, &sf->uc.uc_mcontext.arm_cpsr, err); - - __put_user_error(current->thread.trap_no, &sf->uc.uc_mcontext.trap_no, err); - __put_user_error(current->thread.error_code, &sf->uc.uc_mcontext.error_code, err); - __put_user_error(current->thread.address, &sf->uc.uc_mcontext.fault_address, err); - __put_user_error(set->sig[0], &sf->uc.uc_mcontext.oldmask, err); + context = (struct sigcontext) { + .arm_r0 = regs->ARM_r0, + .arm_r1 = regs->ARM_r1, + .arm_r2 = regs->ARM_r2, + .arm_r3 = regs->ARM_r3, + .arm_r4 = regs->ARM_r4, + .arm_r5 = regs->ARM_r5, + .arm_r6 = regs->ARM_r6, + .arm_r7 = regs->ARM_r7, + .arm_r8 = regs->ARM_r8, + .arm_r9 = regs->ARM_r9, + .arm_r10 = regs->ARM_r10, + .arm_fp = regs->ARM_fp, + .arm_ip = regs->ARM_ip, + .arm_sp = regs->ARM_sp, + .arm_lr = regs->ARM_lr, + .arm_pc = regs->ARM_pc, + .arm_cpsr = regs->ARM_cpsr, + + .trap_no = current->thread.trap_no, + .error_code = current->thread.error_code, + .fault_address = current->thread.address, + .oldmask = set->sig[0], + }; + + err |= __copy_to_user(&sf->uc.uc_mcontext, &context, sizeof(context)); err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(*set));