Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3060144ybt; Mon, 29 Jun 2020 14:13:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuMOK1O3FnnJpnEavpAgj8+ouuOFeoM6mmRH+uid6EMi6n1oS2FnmYX0Qa6fQBqp8/US22 X-Received: by 2002:a05:6402:174e:: with SMTP id v14mr5074147edx.153.1593465205342; Mon, 29 Jun 2020 14:13:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593465205; cv=none; d=google.com; s=arc-20160816; b=p5r8/nRmnBms4XXeL1lv94g7rVgZ4WEGUgx2HY6ngTbSxuvQs+R6GaDaU3T4uQz3kV SIGuaVnJWWWm+irXDHD4/U0kXEcO/n3yYpibJ40zoJ+NL/v4Fd9QWPtpqnEdTFzrIpMO UdV5zc15z1OxGHkAMUkfScs2BDawSHo8M8bH06aqb+oqZnLw52RidT5jvZ5869nO/pbD Gioe105V1EhSosi2p/t9BX75/KR5fawv1S0uevO4VU3/vdeJpke5OGhda4RK+igF7gi7 eNZtm9X/x/rwGdNeqcP2L2rH0DX3btLMGtCnzJ/CS2KtFYztkgqdLPUEPUQfBHh2cJI5 7pTw== 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=k9Vuudb5Rq069DQbWRHiQ4E7IcM0Fl5S56K7RxgASPY=; b=OEZFL0KnZHLfPtRTHkOoFzgIBvbQFFirtmX/hLvrvCnQGWfRYDXpyDa1q9eUSivsdB c8HeRQ9L0pNnSh8Mnx0VJgGJFFmSXhwrmaQXgHmr0vBZ7cbZPQdSrdJ0Fa9PRFp00uP3 UOa17wLi9871eF6QBAr5l8XPK2sb4r25SHm2WVhe+/EVjrZytONsnjVIR0oJjIBDIurE BBQJBht/Zso3DSvvRvssB0w5q2AtIABt9RLAAMtmIeDqq+asfN0YT6wNT4bISY+noQm7 H3Jll8zBm2aH3nIMuw6z1MevuFboxC0HRm4vjvN4OFObWcggv/BpjaELvSLrRkemujl1 yAfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pj3AF0bq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lj13si322655ejb.357.2020.06.29.14.13.02; Mon, 29 Jun 2020 14:13:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pj3AF0bq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387593AbgF2VL1 (ORCPT + 99 others); Mon, 29 Jun 2020 17:11:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:45396 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730303AbgF2TAP (ORCPT ); Mon, 29 Jun 2020 15:00:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9D8802550B; Mon, 29 Jun 2020 15:54:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593446068; bh=t9zzV/CyhZ4bPii2Izp8Lv2PwTTnEZksXP9gnh6vTMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pj3AF0bqTdglDtGaY+9rLbkvZi0bbfxfoY43roUTUYGwxsTDUrMN4zFvQZK8aKrJ3 lYvtwZaUK0Vnn4dZfxgmemfo0aEsKzICmHwFmPJ3wVHS0n/nTPrr8rYFtCgttis6uQ 1gU+7kOr2y54IKGCfBlsfHIGSUJO9gTDlresDmSc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Al Viro , stable@kernel.org, Sasha Levin Subject: [PATCH 4.4 067/135] sparc64: fix misuses of access_process_vm() in genregs32_[sg]et() Date: Mon, 29 Jun 2020 11:52:01 -0400 Message-Id: <20200629155309.2495516-68-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629155309.2495516-1-sashal@kernel.org> References: <20200629155309.2495516-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.229-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.4.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:53+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro [ Upstream commit 142cd25293f6a7ecbdff4fb0af17de6438d46433 ] We do need access_process_vm() to access the target's reg_window. However, access to caller's memory (storing the result in genregs32_get(), fetching the new values in case of genregs32_set()) should be done by normal uaccess primitives. Fixes: ad4f95764040 ([SPARC64]: Fix user accesses in regset code.) Cc: stable@kernel.org Signed-off-by: Al Viro Signed-off-by: Sasha Levin --- arch/sparc/kernel/ptrace_64.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c index c1566170964f3..829592d5efe0b 100644 --- a/arch/sparc/kernel/ptrace_64.c +++ b/arch/sparc/kernel/ptrace_64.c @@ -534,13 +534,8 @@ static int genregs32_get(struct task_struct *target, ®, sizeof(reg), 0) != sizeof(reg)) return -EFAULT; - if (access_process_vm(target, - (unsigned long) u, - ®, sizeof(reg), 1) - != sizeof(reg)) + if (put_user(reg, u++)) return -EFAULT; - pos++; - u++; } } } @@ -639,11 +634,7 @@ static int genregs32_set(struct task_struct *target, } } else { for (; count > 0 && pos < 32; count--) { - if (access_process_vm(target, - (unsigned long) - u, - ®, sizeof(reg), 0) - != sizeof(reg)) + if (get_user(reg, u++)) return -EFAULT; if (access_process_vm(target, (unsigned long) -- 2.25.1