From patchwork Wed Feb 13 21:32:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 158253 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp560725jaa; Wed, 13 Feb 2019 13:32:27 -0800 (PST) X-Received: by 2002:a37:7883:: with SMTP id t125mr192135qkc.201.1550093547709; Wed, 13 Feb 2019 13:32:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550093547; cv=none; d=google.com; s=arc-20160816; b=MjCk3Q29JIbIFc6a3fCVYdu6qjoSu4N6ZUpmI7/J5n5bOmM4kvcv6bJ7rJWTw7dMyS vn0W+6lhGHcjesurJX5aFqmVYLekro0B2ck9DCVb0B4v4d5/D/iJt5LVoiDFHTsBQbvV zMcaZgWcUl0Bvwlhy4y+C7uSLpGefSFEGJbYxvMumI2+PEWoEbLrAl3fAEaXtEAIHnIF 4rTL3OV/Ni9x6GooVj4Eb1mF4FBDvkpGOfxAV0/fT0sveg5lKKfFjDFANsSnRO7pmh7Z OkWvBH+U05jpUxvaGCt1LXRrvlR3Le5OhTAZl4F+8Cz/Rm2wSB9Jz+O7XM9aFkke6BHp zrMQ== 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=ADQDpeTXG9pWgt+iamM9Cmi26SsIAtmUaJH5Crr7iPE=; b=HHyQCjHRBWaG78U5cmxWTw4VQpCC1v9CDXveiX6vQonZsrOD2j+B6Ghil2zOKiI6Qc ErJtHi9x1sQuIqGoJxgVUdJzgw71qZo4zcroZZOrwVP4oOYwDK21YY1OrnoCObYPmpbO CX+RpTMsesxKe/VJpuTZwmVU2NMgJDzIA/NUpUkM4gaL3gLkuUbj3gqA+MdAOyKZFeon Gk6UNg0ufjRy6iAZsSQU5JskK+FthfRVTRxP7pBwcVfxS7cZb82dy/bJEIB3GgTdDdxu RBwC2MpSnK71Dn6JpR8iamendYNQDw/3vrdiRMfuyU4uPWB/9fXiIXdpwtHWxtM+bk9A zvKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bylE+VkM; 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 m2sor564312qti.39.2019.02.13.13.32.27 for (Google Transport Security); Wed, 13 Feb 2019 13:32:27 -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=bylE+VkM; 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=ADQDpeTXG9pWgt+iamM9Cmi26SsIAtmUaJH5Crr7iPE=; b=bylE+VkMOO4hIOd9uSGuNlN74QoZvhmAPx+T+ZSqCbcgSeR4MuoSRbK0/mCLeCS1kC 8mBPhJddgiezzdnOFI1e0Hk2+g5X81whlLrl7u7bZSWxwGo/whqv40ykWCcXJyUo7HCq mJh+iU1KqgisH3Dh11uPsvJMsa5gEiCKNdyarE8ZSnEx+52DgKGvs9j0s2R90GXA3AFP VpaHYxiWpyMx9Y7bqnXA4GMTj+TXYO0rnF4ciqihML+wuPychBQ4XtgJfELKNaUQuS3i Vvv8nVhxWR0kNHavHg6IduZHrDAOW35HJryjTKT/35eF/xTBXm8JW8ncpZB2tW16QG0H uI3Q== 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=ADQDpeTXG9pWgt+iamM9Cmi26SsIAtmUaJH5Crr7iPE=; b=E9hVGBGu7Nt8gWf6ngDViU+xXb0ECfe64Ty1GVoXmm0iGSy+iiTYPzwSSvs46R2QFO zcDBjbHPKHm2cem/tLDcGws056m7rhKVjx/MCDH24MwOuCSd1SvgIzr+plrA8M9Vp+RS b9D6iO6vKjOHmOYnmL7smrMlXxJE5/9LK/Oe4FZEnok4qkET5VTKONCiJkhfF45cXeAX iTG7Ms6MjUf3qm9PDoBRVwbB4VZKZqpjIDQRqFZNNvICyI5zst/+VcZGTC4dX6Np9nIn Xas9NzJLTuzEfwNr+XcGziQUGQo5IgX1R7MWIgEhyNn0WlPfquiOFA2fPGZifdIQljhL DSng== X-Gm-Message-State: AHQUAuZIhm/cyUt011v5KFwY2dMGRE0Nh0c+rZBhcc7Q94GilznxrQ3c xEyFEuUZPTVUnta9k51oeVcsiqX2 X-Google-Smtp-Source: AHgI3IYz8IBn4iko9QcIs9dbw8dxMfkpbzMPcZt31mXi5B2aXwILnN3550Qp33798L+kSKYcDKMOjw== X-Received: by 2002:ac8:2b51:: with SMTP id 17mr229831qtv.328.1550093547353; Wed, 13 Feb 2019 13:32:27 -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 8sm382675qtr.7.2019.02.13.13.32.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 13:32:26 -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.19 01/17] ARM: 8789/1: signal: copy registers using __copy_to_user() Date: Wed, 13 Feb 2019 16:32:07 -0500 Message-Id: <20190213213223.916-2-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190213213223.916-1-dave.long@linaro.org> References: <20190213213223.916-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 b8f766cf3a90..76fe75d36312 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -288,30 +288,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));