From patchwork Thu Feb 14 14:49:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 158395 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1462077jaa; Thu, 14 Feb 2019 06:49:34 -0800 (PST) X-Received: by 2002:a0c:b5c8:: with SMTP id o8mr3262938qvf.213.1550155774737; Thu, 14 Feb 2019 06:49:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550155774; cv=none; d=google.com; s=arc-20160816; b=hBTNtAJXT0ij/SPtlhhD02R1kZhk4UoVNkwIMfTQrXWsE6rbJEXxEM3QKbh+6reI4d /1ATxzIvFKji/e5fRknWVJljxOdKTbCWGIJL6CkSNHhfzzKC/FDpHuIwDmiIcdf6pnLj 9FhlfvaczYdmHseft8dK5QySOPSE16GsJxpMm7jmDYPjQ/T5MI4Gfo7Rqq9jg2m3L/0N LIoAZB7wRPCnMRTWeKhQwKqpF+ajcGfTMovko3cxcvwE4BNMPzcVhEBVKqP+pnEcjXU1 PWc7OT9H5m9PlsBX6q4PM4hSe6xfFnvLV+92w0WNJV48XqjPsb2iKtf0BkBVuw/EJGRP tA+w== 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=4WIiFnR286YtXg1/WuUdSZbEmbvXJmwAS0RFyIqCoow=; b=cgtcBsTG5O7AzAuSgv/jDpX47dCtgytIkmR28YzAVD3CA8tJNspOeXO8hRFFNVI1fU pNOTBGhZ4g5aGsFlk3IZwm2sUYXmFr03EeHlvHjqZ3GT0Ixw1ZvEqRHgneSls1EB8nPM sMge9X9oalXYfDq1RpoSrIUqAB8b+LL+rvcBx39IcmSfTOznJSMQ1ebjzWDOKG24frRx Y3+Ug4fqcjTUqp68nJbEdFSV5eGF61u6JB72zXyUnOuKUGoPK0qSn3+yHIBjDVHY8cDb d2Sl8LplbJdbbuLCjqC9FqELPfPGeFkN4Ss0r+W/tCl5sOkRsbjfbt4QFkhSdVxDfE3T 6U8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vjS+347F; 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 u51sor2909145qvh.52.2019.02.14.06.49.34 for (Google Transport Security); Thu, 14 Feb 2019 06:49:34 -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=vjS+347F; 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=4WIiFnR286YtXg1/WuUdSZbEmbvXJmwAS0RFyIqCoow=; b=vjS+347FIqlPezMcSF9P1GiEymL0yVmYKwHcKvIn5Zh1j81NA3K8pt355ZvyM3oFEL o+nBQ1EPz/TvytR6mW8IYuHkylt/2oRDy+Al43fFGBrwOZX8yu4KxL/mWYurEImpc2v3 v1/BD0g1jWrB8FFfItN8RE8aF+3X4P4NViFcEr3XKU6mRUD/PHBBIQ/7GaX+GOjAplgS CNVm/Ka7UAUzVcOHtxp8AVZIgp3NLQQZIg+kQydJ0zQcIUNukx+fEwpNp9y1ttEQesZq 4JQaC6JzwE0F8sU8emfthgJdIuYB4l+RSYOnSlN3YSJCCIovkUmRIQ3o5LCSGCxfu6Tj YpVg== 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=4WIiFnR286YtXg1/WuUdSZbEmbvXJmwAS0RFyIqCoow=; b=OrM9ekMcwb59JepdvllddWZsxxDTjGfti+NUeiVppO7tl+2uMTXeT0+zkjzoj2ufG0 gdB83IpMuqZsJyx4VdgZhrGg2HGXncJMKfnWfNjXcElK13+Z7c3+gKZMUlcjO6tFnrAd v8SoiR31+V7227f3+pi18B1d+ji2iDhzsC8mAQOSIrzYkVc8csDSm0KXMN3S6D5sUTNR 3g4XWmnhp7roF/lmjO1s5kJWmJclXKchv5xn4VX8OVC14IQ81DkNQrikEfBWHnnQnEd/ dc1iTJGJPlPlvjRxvVMPuDS/SCMIDcPGaP/DsvoJvpNOY7DIX21QlEC4NwBfn8JIfjiY 3pEQ== X-Gm-Message-State: AHQUAuZpjbg4MtJxt3+kXX8zILAqlIH5TTKRnbOOZVTAlX404nCFl+Iz TCW+H/HOgnKvdlhuIMuN3UkOp0w3 X-Google-Smtp-Source: AHgI3IbTd7fk7ewlUXB/CpYwJJAWXjLLqU8R609Vcmhiohlg+LEEECOFCGSqLwtZ/hLlk2SpHaUXCA== X-Received: by 2002:a0c:d2a5:: with SMTP id q34mr3277880qvh.102.1550155774386; Thu, 14 Feb 2019 06:49:34 -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 k66sm1498919qkc.25.2019.02.14.06.49.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 06:49:33 -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.9 01/16] ARM: 8789/1: signal: copy registers using __copy_to_user() Date: Thu, 14 Feb 2019 09:49:15 -0500 Message-Id: <20190214144930.27539-2-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190214144930.27539-1-dave.long@linaro.org> References: <20190214144930.27539-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 6bee5c9b1133..fbb325ff8acc 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -256,30 +256,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));