From patchwork Mon Apr 9 00:28:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132968 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp675345ljb; Sun, 8 Apr 2018 18:20:58 -0700 (PDT) X-Google-Smtp-Source: AIpwx48MryZdE7Ndsx78QYp/tQwKuv4qd/OaJhxMEGstXPfchHzkLaGsRcN5US1TbJ/bHhaoMnq1 X-Received: by 2002:a17:902:5501:: with SMTP id f1-v6mr36074903pli.50.1523236858117; Sun, 08 Apr 2018 18:20:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523236858; cv=none; d=google.com; s=arc-20160816; b=Z0RMSHC8f/L3OI/cM3kFpvcErJty4uXiU/HffzQZNrrzpxbyGqEUEIzqSb9jd81IRH +Ys+v2stJpySDT9jpGFG3A0929xK3oUPKL8YUP4NXYSnRPR9WvgFUi+Tf4dvX64O2u6Q jYhZoENeuMKyuiciNeaFGW4gEyslAxReFn+8+WHLD2lavad7oMG9tcQG8tBDizRpE8pw OIp7F9XnfTs8rRWxj4sKQy6KlqbmQ8Nnv5FhAz3bkNvwTMG8Fczh0odtvtzFEww01jUR kI3EyL+mKH00giVIn0kh3BCx16fK3YqauWmENpozSpuB29ZkUSFmajb8GximsZwHxvjK G9fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=SybOediApRqhVsy3Ea12peFVsuuUTT+TFwWiR8aAt2k=; b=WCnQbjq737juhgqPAcqxN2xpZU4hITUvajhtqYNURddCsCQGnk9reTDy5lmnuJnnaT o30+qSdLL/wNio5kz3aQEVs4SSAgSUv1BnYKsqMIr+0e36rUHy94/a7SP7Fr45m0S3MR i3UIdjps6rTOMl8OYtqlLlqYheYP39nG0o1mXCd1GtkH7/TXKzPFNed+v8y53cUT6jSc 5NnIvmx2vZ7yyGD3K0Fn1RIoY7pAHZf+vtD587ku/+PYNYnVo6uYHQSHL8/75Wlvaivn k8JkZM8XoOQZcY/XpG4kqySFgEhB+xjpBKsu5jhsTEJRwO0TFLrSiXG9dcjLgzGMukHl HSFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=TCBthZvV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1-v6si13281803plw.143.2018.04.08.18.20.57; Sun, 08 Apr 2018 18:20:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@microsoft.com header.s=selector1 header.b=TCBthZvV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757305AbeDIBUz (ORCPT + 29 others); Sun, 8 Apr 2018 21:20:55 -0400 Received: from mail-sn1nam02on0111.outbound.protection.outlook.com ([104.47.36.111]:14488 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932762AbeDIAhL (ORCPT ); Sun, 8 Apr 2018 20:37:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=SybOediApRqhVsy3Ea12peFVsuuUTT+TFwWiR8aAt2k=; b=TCBthZvV5Nmu5M5DDKy0GVwP2+O9PDcn/mBlTSGZr67Uo9E4pdwueVEB24HTrWjbZUT8OEeBRlu0PdyRKMd2TZlAQduxV6lJpVbUfhJl6ANJ0BnQrlf1ygp7dqORi4yD6Oe1pZPIlu3JyOy0YAFy2xP9oSs918XtsiP+M4W/MLE= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1031.namprd21.prod.outlook.com (52.132.128.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:37:08 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:37:08 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Dave Martin , Will Deacon , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 090/162] arm64: ptrace: Avoid setting compat FP[SC]R to garbage if get_user fails Thread-Topic: [PATCH AUTOSEL for 4.4 090/162] arm64: ptrace: Avoid setting compat FP[SC]R to garbage if get_user fails Thread-Index: AQHTz5m7YGhm/cxA1Ua1PIjVNbV6BQ== Date: Mon, 9 Apr 2018 00:28:50 +0000 Message-ID: <20180409002738.163941-90-alexander.levin@microsoft.com> References: <20180409002738.163941-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002738.163941-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1031; 7:Z9w5uhNSCyF0G1WvazE3Q/uSB6P5i+G9FYljg6Sy+0nCRkne9XYXXwWgrr3PX+rgY76zkeK2Y/f1AADccwYNHW4cQNIXs1wqZnnmmuwJzfr3Ob+tNa3/yC7rNl37v44AT8BVlgGyWm5s492pr30ANSd0tgm4Gh8BgmYdT/th9fD7b7xBQniNXos3resrm5dnaRMJiv32GJx8kcy0KTsxvWIm5CiRYtTxunks+v26N4px6cgK6vPtePqU1ssl9lJj; 20:dcP621dpjuXmsDQ+j3e38wq1m8b4GnpMjENtCBXHJRrev22J2JA090wN0BfSweH3Fs3haxjfCYwoTgltphnR7dZoUVZSB96a3UEk23I8uBE+PPw9s20zZu2Ba4/+WRjpcE9mI44qnq8vjQcUPs1pWHsF5Wr0NNdsrKy/AEIWDPw= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 76b106c9-9015-4f7d-e37e-08d59db2067f x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1031; x-ms-traffictypediagnostic: DM5PR2101MB1031: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011); SRVR:DM5PR2101MB1031; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1031; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(376002)(366004)(39380400002)(346002)(39860400002)(189003)(199004)(2900100001)(10290500003)(99286004)(76176011)(14454004)(7736002)(11346002)(26005)(6666003)(86612001)(72206003)(478600001)(36756003)(106356001)(66066001)(2616005)(186003)(22452003)(86362001)(68736007)(305945005)(54906003)(102836004)(486006)(110136005)(316002)(6506007)(446003)(107886003)(53936002)(4326008)(105586002)(6436002)(6486002)(476003)(6512007)(5660300001)(5250100002)(25786009)(3846002)(6116002)(1076002)(97736004)(3280700002)(2501003)(2906002)(81156014)(8676002)(10090500001)(81166006)(8936002)(3660700001)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1031; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Vc7ZmIuD8OzNJ5YN6giiilFkV4opDx6yHzaR4WJ3+pN1Yz4UkUnhuMVFbqOr+OmLH1BHxj33dkTNuOqGZ3mISO8DFZoLS7GqkA2PU4e8vdoOoktgI4ExVCFTtiFeYArxCemanm6Q6hQ2OXooTuGm7pDhOH50+JBp8hxN5Khsg+mwm7dyoQzrUrJkxsWqrx+P6vakudQjK+mvyta/JD4s/syaSonhBILtoJm9RFTIOxYafjFYCoqVN98gwtMPz9VbBV3tf/1ilSU2hE5loH/YOHhpu+OINTe0HbPIT7lH8YA6CCDJit12c6LDdw8cTZ/A31scslQRokPwfD7Eh8cXolPepVh65opJVpZjlzohU9muW04Lbua0g4JsbS8mCWKhZGzVhHeIt4wuX3ishe7KcxCVZW6PEyWLU4L7KrOAGEM= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76b106c9-9015-4f7d-e37e-08d59db2067f X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:28:50.2084 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1031 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Martin [ Upstream commit 53b1a742ed251780267a57415bc955bd50f40c3d ] If get_user() fails when reading the new FPSCR value from userspace in compat_vfp_get(), then garbage* will be written to the task's FPSR and FPCR registers. This patch prevents this by checking the return from get_user() first. [*] Actually, zero, due to the behaviour of get_user() on error, but that's still not what userspace expects. Fixes: 478fcb2cdb23 ("arm64: Debugging support") Signed-off-by: Dave Martin Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/kernel/ptrace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.15.1 diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 183f39384e4c..b81fa63bc834 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -834,8 +834,10 @@ static int compat_vfp_set(struct task_struct *target, if (count && !ret) { ret = get_user(fpscr, (compat_ulong_t *)ubuf); - uregs->fpsr = fpscr & VFP_FPSCR_STAT_MASK; - uregs->fpcr = fpscr & VFP_FPSCR_CTRL_MASK; + if (!ret) { + uregs->fpsr = fpscr & VFP_FPSCR_STAT_MASK; + uregs->fpcr = fpscr & VFP_FPSCR_CTRL_MASK; + } } fpsimd_flush_task_state(target);