From patchwork Fri Apr 16 07:55:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: He Zhe X-Patchwork-Id: 12206909 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FAF6C433ED for ; Fri, 16 Apr 2021 08:24:39 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E79C96115B for ; Fri, 16 Apr 2021 08:24:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E79C96115B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=JuMrvlYVQVNG/J6nqHjqZ1W5e5YKxgFeaKi4S8q4OaU=; b=FUPzjVgDUM1g/3 szsEKCEnplYBf7DDXJjgB+oJDshXxbgRV8usu5ekFZ53S8IJ4rcv1Daw6BVJod1zdv5LfbGr6Qdks 2OaG3/eLa62NlCfAyHgX0f+sJk2VsrYloYIhfroLV03gpdGEeNRKTjZ5yUsNNJqoufHp9kHtrxTex +ApRdLreYqXcV3ltkUEFEH8Hr1pM6Im22NjqZLLMMDEGOEhigE4x34JqD56Ei/u0OiogCuZ1c4CKy hnRA7Nn47jEvqIRZzfo55b6hTBVFt4xgJGi1vfdfTsaxz8HhbanVOSsKKG+D5AAACHRd3cBcTJZty uL8ggob0tZlXLwYqBKYQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lXJiz-001K46-Ei; Fri, 16 Apr 2021 08:21:14 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lXJKc-001G57-3j for linux-arm-kernel@desiato.infradead.org; Fri, 16 Apr 2021 07:56:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=MIME-Version:Content-Type:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:In-Reply-To:References; bh=TMX4HDG+uDIZ9Wjj1oVGQqWUFQJSs5aN6Dbo7FarFNo=; b=aelTwnhYnI9qljfltSW+qFk8/o 2sEzicjzJdcNeqCS2JKKKVwUYImujbOrYFrOKabtmCnCeGAAmkEFyE3AvDCklDXmMBIgl5Q4vc+uB bKOnQZHWq1BZM1hTZtZnUQSr/FpDm8HtUcW8FJ09m4hh1gJmafBDHCWiSa8K1jxgLEozbgTh06XRf jk4bn3a/Vg4WsP5M1oogsh1qAb+OWbS0IAxQIMRPx/pZdgQJZ++wWhrVLPIm7V0g3wZPvx7PFtyzy uL0BamjFSqzc1PdUylDPAcDgGVJsf38Ewd55mA8qgX4QlA/1TbVrALkH/I2q+GSQj956cT391pPFx bYEiCy7w==; Received: from mail-bn8nam08on2061.outbound.protection.outlook.com ([40.107.100.61] helo=NAM04-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lXJKZ-009ATq-5P for linux-arm-kernel@lists.infradead.org; Fri, 16 Apr 2021 07:56:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gBeWdnqkQ9pA3ZWD03lOeKL2HLKPMjWaFGV0S+t8/E+NBMPY38iXgpIkZdUdfgqDsaIlqhNn+vwdzue9+neAgg3jcV8bLWPU/HrQ/UCDKnGH57hByytX7occwa8SEhkc//cnzPcZ/+q2vPjanHMHW3W6G+ScWplvsomeFtnJthmqRhNq54otVuiMqH1FJrjYAndICarluN/SIj1LRRK7RogVVOJzaW6FZMqVAgid6He/T6xastQZecLHW/KkfxyhVXH2R7fQiQJd/4c9bAYlyZxP3Xnto34zwIizHGmoc3hWws4QZv3gSfgAAew2XqDkw95n8qEOMAbQ/0gIl4tgLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TMX4HDG+uDIZ9Wjj1oVGQqWUFQJSs5aN6Dbo7FarFNo=; b=RwMs+ZQC8Bxgxtp0idcdu0Ob/hAgQE4b/BZU7k327QD4A2znv1quPzwHXVGMtRW7/lIXSOH4yp8xlKS19Q343VMt1eO5yPjq0LzEHrw/jrz29FgXYifhp986b2J000dziUjQkrKdSi4nsdAdrLRFEmk1pdTc7dRRCqgsNR4wgOiYg6VmJm05KlPBfYI9juW+gtjadtGASmbii/D78O32Of3P+g6XJJ4CrCCO/11BH25uJItagkDnSLWiYlTLKUWbgBaVtmraOUrtgyjbZVnHyTpVHyV7ZXaUx9WRTJri/zYM2roUa2qgOziZjaKlk2ODvwi6XLpRDvOlm2JrK5A0Ng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriversystems.onmicrosoft.com; s=selector2-windriversystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TMX4HDG+uDIZ9Wjj1oVGQqWUFQJSs5aN6Dbo7FarFNo=; b=MUILitxWFkUfqW+ZY+4M9j4Mtkd5MP+5+EsmAeGgIOz2vtGl9nQ+WVrDIkRXT3U5RntYkADlj4J/Nq3NS8NUvFkTjFYfhD6nE/4ASpiCeC8pUnxnL8KZMR6nsSelBXh9Fe/CDo+8joOsRelntOGwajbsx1S81WxP8OMjH/0Taho= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=windriver.com; Received: from MWHPR1101MB2351.namprd11.prod.outlook.com (2603:10b6:300:74::18) by MW3PR11MB4763.namprd11.prod.outlook.com (2603:10b6:303:2c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.18; Fri, 16 Apr 2021 07:55:53 +0000 Received: from MWHPR1101MB2351.namprd11.prod.outlook.com ([fe80::c156:455d:860e:ba87]) by MWHPR1101MB2351.namprd11.prod.outlook.com ([fe80::c156:455d:860e:ba87%4]) with mapi id 15.20.4042.018; Fri, 16 Apr 2021 07:55:53 +0000 From: He Zhe To: oleg@redhat.com, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, paul@paul-moore.com, eparis@redhat.com, linux-audit@redhat.com, linux-kernel@vger.kernel.org, zhe.he@windriver.com Subject: [PATCH 1/3] arm64: ptrace: Add is_syscall_success to handle compat Date: Fri, 16 Apr 2021 15:55:31 +0800 Message-Id: <20210416075533.7720-1-zhe.he@windriver.com> X-Mailer: git-send-email 2.17.1 X-Originating-IP: [60.247.85.82] X-ClientProxiedBy: HK2PR04CA0064.apcprd04.prod.outlook.com (2603:1096:202:14::32) To MWHPR1101MB2351.namprd11.prod.outlook.com (2603:10b6:300:74::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pek-lpg-core2.corp.ad.wrs.com (60.247.85.82) by HK2PR04CA0064.apcprd04.prod.outlook.com (2603:1096:202:14::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Fri, 16 Apr 2021 07:55:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 808f9646-ef10-49fb-a4b9-08d900ad0eb3 X-MS-TrafficTypeDiagnostic: MW3PR11MB4763: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KDazGbaZzFrA2nKTl7qLk5Qo+DshriCVsYtmrR5+1naw8FQonlKCvnaVOpuEqhd3MSXqlphqJ1OmShCwz+1Dcp8ngbGqKKglHC+RnDj83mT+Kyp7UhBrFuA1ol3YaV2HDsikEWmb7wchpSE+iaL8fshDFMc4qELrCqBX3h32LpyCLgkg0mN/EUT50iRXb3Ak2qTF787hk8jwq5/d2kFqB6lFrijDKraFq4Mc5ZTdGk5XFz7b3lBAejTzB1ut9ksz0ifnChw0ybUKj70qhpOXb+EUlfCNyxpyk2QPPbOvCG3RJb9UUhrIQoT9FQVjFgiLl3MpjePdToxxilnem7uvS+nurIo0CC+r7XlVNSnXE/sLw6p4F3OjDHzsCmzHRX6gly8pg8IWS8QvCQNZteGCozPrG+Q1bG0fdTjGHP/n5Bga2PbmQBwNOwXKhP1viajvhyZogDW1KsssQCEuKBCPLFSmg6MdW0WvpefPoORB+JEca5dER1ev3eQQRdmmyecor6wphzzSHWIBOgYTWC33sO2aWcQzFaRQzQXeGuG1KOVEPOUkDW5oomgpjWVKGJ4A0vZgd69ZeWRKaPah7HtZN6ed2QjaQzd0NZcMUD0QmynHaVa9CiFy5JhU1OrOBYyzHZEGo0I+RBzED0z2ei4MnExMUmSt5Rv1P7mMBEe51r8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR1101MB2351.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(346002)(396003)(39850400004)(376002)(16526019)(8936002)(38100700002)(316002)(186003)(6512007)(6486002)(8676002)(66556008)(38350700002)(5660300002)(956004)(2616005)(26005)(1076003)(2906002)(6506007)(66946007)(66476007)(36756003)(478600001)(83380400001)(52116002)(86362001)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Ko2oklAoGkkYlNJkhDR29XFt13f16YjUdrRpEtG1hWLdZWZvSLifZdTjsZadbmsP/4941Gm5JNvNCJ4b4avkjYJKzAC2ci1ga82cGW+C955i5cKEEsRcbs6aOHTB+FYnrOF8XB/AwkaVPW43sbnAR+SWdmq5VAsq1pkd+jLhhV/iJ/ybyLR9ZL919HqYp+jwMoDdrtBZhflIxLMxrWpY3b0w7tikoa93IjrHMTtJRFMfBb8fH8dDsSwh4rcjx6i/YNNGMgyKNb8dVcDcSpMF/RVQ9wLSFKQ4N+kI0Quhhwen9keSn7iwAKh31/EGOFC36cQXDxeC3CFIcYDRfQ8zxbcsmmmBmVKkSAkh79OHrfYfOMTyN7c5o4T+oODCVeblXPZYKpAcxtu5qsi3LCzQQJFyS1y36R8FY0qR3PnpYjiH6C1lGMYs2/YvPQg2g+WxIgNEww23JnxrtLOGxw5tGaRprYoqG/F3rz2EbfkFQfcY+euNVCYpqgrFZqhdqlSIwLu6oj9nmzGA0MptrR923jYEJU9jtLWoToKMduiDJF1qxCYo7jjt6mU2sRJM3Hlmvy7l/kVBWTvWSKrJ8LFG1kg+mK7yq+r1/o07T5Uq8v56E0B20FT99+mvMq1C2Tpz2gl/O0ymMFXtTiIoD7oFYFNyweRHLCb5Dbly8+jfyZ3lB/SNa+PWGGFnupmJjWAheds24eE1xrSYEy8y9F89x8aOxlP/mgvTopK0xFgCa566D8/YcOcGfSv46vP/+tiIeGYKFOS4fqeUnY5Dhr5uXwQmuDihl+TXG0aT7YhqJim7qoMFdmB1LVnntx9eT75u1XeDmHZIbje6BXMoAbtW/jVGVA7Pqi6KaC9cTLpDYys4NBrLh0NkuC/Z1d9zVtPsNL/xxYMhZjg22aUAaQivRUsBj6mXFM+ACSkckAsswfJQVHI4q7iib0vttfgRxymCcYlyYOkke5VVwL/BYWHlbRZPbNOCEWeIGqgHtnzehv+j52/zTZvZ6Qr7UDW92js87Enwj0RGxa7ItDYzsKdW1P7fmqhtEPI5uqXxFCiNO9Z9G5TwMi85R4zWcvsHtpZpsgMTWMLVUMrCUo/ykI3EcQYUGvg0QwhEnyJw1XuevPBowLQW9cSYxZn3F1/D0QGsCoeMJj5YKPiSot5ioypG2Xmmq/bHNjT2d0V0YmoED1Xf5J1kWXiq/FKt4uHddUgB4Q4Fm3nzOfQHH/l3wKONI04htx50Dcw8Q3ITjZ+Tbiqg15QTOBGEskgSqmLLoMKalWTnpAaMNGhGjshsIHKR8ZI2kSddRp4MqdoDYibnl6qWbmgSTyXwpHGL2G4HbF88 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 808f9646-ef10-49fb-a4b9-08d900ad0eb3 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2351.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Apr 2021 07:55:53.1839 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IQ30CzyE9JsDl8fIzzzKK9c0RyDlm2+sQYwkp15ir3l62sv7uC5Nx8c/Csptdj1GpHVmglU9pce0D/r13Iwq7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4763 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210416_005559_227520_9275A990 X-CRM114-Status: UNSURE ( 9.39 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The general version of is_syscall_success does not handle 32-bit compatible case, which would cause 32-bit negative return code to be recoganized as a positive number later and seen as a "success". Since is_compat_thread is defined in compat.h, implementing is_syscall_success in ptrace.h would introduce build failure due to recursive inclusion of some basic headers like mutex.h. We put the implementation to ptrace.c Signed-off-by: He Zhe Signed-off-by: Mark Rutland --- arch/arm64/include/asm/ptrace.h | 3 +++ arch/arm64/kernel/ptrace.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index e58bca832dff..3c415e9e5d85 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -328,6 +328,9 @@ static inline void regs_set_return_value(struct pt_regs *regs, unsigned long rc) regs->regs[0] = rc; } +extern inline int is_syscall_success(struct pt_regs *regs); +#define is_syscall_success(regs) is_syscall_success(regs) + /** * regs_get_kernel_argument() - get Nth function argument in kernel * @regs: pt_regs of that context diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 170f42fd6101..3266201f8c60 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -1909,3 +1909,13 @@ int valid_user_regs(struct user_pt_regs *regs, struct task_struct *task) else return valid_native_regs(regs); } + +inline int is_syscall_success(struct pt_regs *regs) +{ + unsigned long val = regs->regs[0]; + + if (is_compat_thread(task_thread_info(current))) + val = sign_extend64(val, 31); + + return !IS_ERR_VALUE(val); +}