From patchwork Thu Aug 1 08:16:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 170335 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp5086358ile; Thu, 1 Aug 2019 01:20:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqwAuC5gW1joc/ewBq2F1eXSMfcUwX2HOlv6ez0a+PLKDGqfNI2awvmm+4qVYeEyJXJ5Kadq X-Received: by 2002:a63:f118:: with SMTP id f24mr120510710pgi.322.1564647650109; Thu, 01 Aug 2019 01:20:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564647650; cv=none; d=google.com; s=arc-20160816; b=fRPOBLg3DYeuLMgNNyNYYOGWxzy+Cw5NMmCW1aeX3PTceO88pyNx0OCBbOZhX/HkwI tjAz/ZvVOB5XKVq310BQwWOy+XOWeLEKAseX1whp2pXLK6fbvdXNYPCRXXnN+0SESh1h DupTheIgY6qF/DLHsvoGC9pCgDnFHFUvVNz2xOSTKtjQap6tbmQK9UGYkpn9kmurqH1v 5L7Ruq3NFKSzcN/cJVLo5BxJM2FUMBOIQwguTcql7zQaRsx+wi5Y5zidvu9x/TCPr2J5 Il9kc9X5FDbQgm6FWkivJMvYfke3sy7Z/4NHs5WzAOkmwB0GCWJoOyzn0UQlqkIFrI42 wQHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MgdKvQC/PG/qzasZyBmDzAkccfxFwFqJHdwmPruVads=; b=QyFr733lpROKvbGacdaQsZygL/2xkDjMlEOuf8kMlfLlQ6+k8MwjXcq+Z3WPuHGzVU 0XTIcHuhxLR1+dr4lPaXjTjhLKoJlQnCY9j7ifXXM4vCwMH7boE4zOD79CT6+8JGsIBO aPl6VfZQopybO/cSiZCPXD+Tp89FStSa5qGzQf2F6e0JUBtsa8wvkVDf0j1JZo219eOe zPenoDpcSGL3sXswUXXlHfgZV2J7oK5Ljvra6U4jWcgqW3rTtY4pa7T6E9nHi8QFetA2 e174E1zFXhY3SKvbk+pLZaN0i/GWClT/J0RCNUI0nqIPAL/KkXElSCRlPsBWMxYKEpYO m44A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="M/W0Na2Z"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v63si6543334pgd.111.2019.08.01.01.20.49; Thu, 01 Aug 2019 01:20:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="M/W0Na2Z"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729672AbfHAIUt (ORCPT + 14 others); Thu, 1 Aug 2019 04:20:49 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:33325 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727171AbfHAIUs (ORCPT ); Thu, 1 Aug 2019 04:20:48 -0400 Received: by mail-pl1-f196.google.com with SMTP id c14so31784329plo.0 for ; Thu, 01 Aug 2019 01:20:48 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=MgdKvQC/PG/qzasZyBmDzAkccfxFwFqJHdwmPruVads=; b=M/W0Na2Zy7+HBEvHxxb6P/FPKdVkMATRN4C9Zb77vqKqQhL6z7bpMb1EeSx6PCKSXP WIpm09ydesGuVwKMj+W1yik9OCyQfN6plQEwk4acdSnuulENxPHSU0NaxsqQRRX0OI7Q CJ0tqIjPLDjnBIOWX5BruNZGIu9Qcme1K2e3M+sHqvXxw5u8OHzx11C0FhOuZ3LDh7OG Chz2+U3DN9zgQWBVGzmzxpJA5H8T8XIB//yeb10FYl9FV1Dimc13X4LokQdTvFyqY6vp ivz+ZoapG/08jHgX0zsH7JhOVAEay8pOIsb6pQiJUTzbVriQoqreFrBxWT58hO5m/UO3 cJbg== 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:mime-version:content-transfer-encoding; bh=MgdKvQC/PG/qzasZyBmDzAkccfxFwFqJHdwmPruVads=; b=ULFfBSxfgapmkqgiwaYLZVbsoApkSUJP+gTCHy8xkJObOcrNdbW0JMgHTYd8pbLwJD icz8Z01bwmLyTTBpFRiP/u4nG2xnbcwY3YnzEtRcuXmhC23cBGCvnz40PyYAEiaJ638Z jH5GWVRr/2zOBIZA3vVdV9uCSI/cUfIIm2HZB4XlQ4jBzXXbtHeuyCCDaQVBMkfa0yMr 19nSYW2LnYB/CCuNiPlV2Uw0TTtoJPtaLugXjIl8VxykLs1fymXRgaAOEpKJ5GIw1soS KIfebfm3YJ1lFHNjjhOak4NQr8V1uUyhQIg+g1/mMHStdz15zgw2rjq4XHo8BXAyNvNw n2Ug== X-Gm-Message-State: APjAAAU5HPi8UADzDfQSJXsZdwI/Bogus3jkjUJLLGU/RUzcrx41ynRk 0nGGL6iCbvXJtr9bP2oIXV2j+fRcxRc= X-Received: by 2002:a17:902:f095:: with SMTP id go21mr126863136plb.58.1564647648095; Thu, 01 Aug 2019 01:20:48 -0700 (PDT) Received: from localhost ([122.172.28.117]) by smtp.gmail.com with ESMTPSA id z12sm52519280pfn.29.2019.08.01.01.20.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Aug 2019 01:20:47 -0700 (PDT) From: Viresh Kumar To: stable@vger.kernel.org Cc: Viresh Kumar , Julien Thierry , linux-arm-kernel@lists.infradead.org, Catalin Marinas , Marc Zyngier , Mark Rutland , Will Deacon , Russell King , Vincent Guittot , mark.brown@arm.com, guohanjun@huawei.com Subject: [PATCH ARM32 v4.4 V2 28/47] ARM: 8789/1: signal: copy registers using __copy_to_user() Date: Thu, 1 Aug 2019 13:46:12 +0530 Message-Id: X-Mailer: git-send-email 2.21.0.rc0.269.g1a574e7a288b In-Reply-To: References: MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.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: Viresh Kumar --- arch/arm/kernel/signal.c | 49 ++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 22 deletions(-) -- 2.21.0.rc0.269.g1a574e7a288b diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 76f85c38f2b8..98685e2523bf 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -255,30 +255,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));