From patchwork Fri Apr 23 10:35: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: 12220081 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 C227CC433B4 for ; Fri, 23 Apr 2021 10:38:26 +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 297BD613D7 for ; Fri, 23 Apr 2021 10:38:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 297BD613D7 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=5YtT0s55aGLGskbhSVsZEZ4fNx2pctJIstjl4llcD/w=; b=aAod7icKpIFk2h 4hDc6YhaMVMForPAqpvzYsDBK0ZE5f1hBSLjDtySOt+KewzlLyxsrsJ11uFicZSgnLV1FCmP325dQ lT68SIOh0DT7gdOfBH0kBkixhoPKqft6gX4blgBklEcA1jL+lztNDdJqm/7jjtBCDSh8/7Exr86KG cAE6qlHQtXNyO3eKvuxabHYGZ955krr4F5O+thE3LSnyEXymEuf0slGLYFwxFqhWWDfs980OhdsqN csGvRjF+sWKudEBcNduddIckuSIVzuvP3/5NFL/MoNgoo3VhkODzYkKeJuJ6RVwmqoE9MOG8fCv5j 2mSuUxYel97+a3LlM8GA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZtAK-001Jwn-VC; Fri, 23 Apr 2021 10:36:05 +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 1lZtAG-001JwH-GI for linux-arm-kernel@desiato.infradead.org; Fri, 23 Apr 2021 10:36: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=s5ULuJNq832Bw0rukmRVELOKgATbQUbAU5kBZW8Vc2o=; b=NqgrNeEGqBs0y1SfcNp4NvxONq H2vXqElvkhAfpG6xYBrGtCvLQ2whqBTB/HYG+ycnkZzhCNcnwo+a/nT9LOeZxjguISQoFxlGIqKAd oS+j5e59+i2FEzf3J4W+QHPpq8nbaGUsD2am2Q9a6M9b62ofQL9DTRTC6XOOdbvyUHKxVAg4TZSIi YxU55CmSIpdQ6Ik8w43M52AmSB5MIDPHkwTePBNiSELq+7klxuISwL9gzGCeMcU8yWu1GULCUvVeD 6aSMPpqhsuGC17NMo8AqBuf7TO+W3AvTjojmMUQ2UEM/wPMTAeUFyFpO+BauFbSXg/Izezx23LuSD wSYTxE6g==; Received: from mail-bn8nam12on2066.outbound.protection.outlook.com ([40.107.237.66] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZtAD-00EKdZ-DE for linux-arm-kernel@lists.infradead.org; Fri, 23 Apr 2021 10:35:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fNYgWSOcmDeDcsSaTqStZjAYiqfloG0iP4CVJ8Re0CJYlfO4ZUfzGWZBIOV8sBL+uRoKIPuOQX7clVaejgGmDHEGbABoL+RxRRXNIQsdr74qcfAr5nWp42WjF9cD+YnlbHm0dMtXUDvr0JEbojrmsW1w162TZIuMF9lnmQhEvBSY9mtqUgmlpRM1L3/Mdeudu2JgK0dBj6s4hrg0Y58yMBAoZo9hVHLS+nVOx/Qnor6OkDhsq1hK3OUIpFt36JlfSoaESRjl4aLGq6b/364vVN6HjsBGZwWA9MvDtWGqUDSnyPr+FRB+8Jba3e4KoqA7JDdknHle2eO3N7Ff5exuhA== 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=s5ULuJNq832Bw0rukmRVELOKgATbQUbAU5kBZW8Vc2o=; b=cLAvaqp7PAfdYBorgmUV6qBKNdkDWtDAauF7HKIkGlU7IpxEY1JnA2RV9hsk0wWqyg7VuloSXnKR1foLm4d3HmgjfPXZAnEfcV8loQwH315CiHxMVVlTVib1OsfQvAqS7fkR3vVe/z183DHdkuqfmflII3Idymadl3/KqVIZe87SB1m1HfzQdrichaIGeC+KEgXpWnf9NKnGJ9eGsYlqCxGyi9CV818feHIli17rRrRJi5rUdF0sDdwbSwEPG+vW6oNw6fHtvZ6s94Ut53LIs+Dj9Ws7X0jiNXAEG83Y7nXs1EBVi/ux6niCiRI9akF3EI88Ol5D7sf12A7SCwYbkQ== 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=s5ULuJNq832Bw0rukmRVELOKgATbQUbAU5kBZW8Vc2o=; b=a4dQddrb08DYngSrdW0lVfI9lvsciLcggc/UaTkgiMoGFbKaaMxP1IaCe0gXkBq+6Fz8kmJfTXFqra8ozz6OkPnPO4qSwGNGll/IwESg0lZfaReFBquR8atkgWVP/w5dQvZKZDTAOEL4A1Lu92u1lq0gBia2z6W+ntmvRtzyi4k= 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 MWHPR1101MB2192.namprd11.prod.outlook.com (2603:10b6:301:59::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.23; Fri, 23 Apr 2021 10:35: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.4065.024; Fri, 23 Apr 2021 10:35:52 +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 v2 1/3] arm64: ptrace: Add is_syscall_success to handle compat Date: Fri, 23 Apr 2021 18:35:31 +0800 Message-Id: <20210423103533.30121-1-zhe.he@windriver.com> X-Mailer: git-send-email 2.17.1 X-Originating-IP: [60.247.85.82] X-ClientProxiedBy: CY4PR19CA0041.namprd19.prod.outlook.com (2603:10b6:903:103::27) 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 CY4PR19CA0041.namprd19.prod.outlook.com (2603:10b6:903:103::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Fri, 23 Apr 2021 10:35:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: db8ceb0e-bd69-48f7-481b-08d906439150 X-MS-TrafficTypeDiagnostic: MWHPR1101MB2192: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vL5iQSq4zXJcl10VQTbg1Bz/swL4hIKeFSiTGgTEmQvnjTVrHHXINbDpW/zfXI5NCWblVi9AnahfpcN/ElwMfc/Ct92q8ENZveUFNLufcZbCHk774ZTDVldJHtUAbk4gXdUr3oXdgypBiBkxJaeU0WrQW9VTZI7JwUQZXbg55KI94iLNe6Ht74+IkemW+fTdpeLuxlGE0eX1U5eXhWYvGd72aLd14Q63ZNpJ7SgHcOY25mCbGoiQzxwlyRtOgyrgHi7Sbi07qCVIzSAL6CkUnnZ2IG2caAUb49iZrUr5uqlpDV/IiAMkwa11OOn/lWBE/pGEp/8nWV0MvG8VeMINZ/GJ+j2LbfR6lySFXU8cKpiAwsuNo2Ufbza8f8/7A6a62UKZfXFrwKuNLNVBTVx0ULNxpAS9rY2MyIz6tAqR7vHf/pYI+K1iX5n3efE92+66mZ8rdOwX1QdsaUANHzmmwRUan/lfG9eNKAOFiGNur07hvwejroAisTnj762EVvirkxug0DcNxRAYQMtAoaJVI8jQUgZAJKiL7zg+e7HkbcYJAAPLBOnP71E7WDOiGlZlkrN6h5cn5lnQF//7Q0P/c78ub2qS4gfUzPyPxH1i00dayfTwz2fe0YQ5JqR4V/QXhWxhrVL+a2F3Pr2WFRHKMQ== 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)(346002)(376002)(39850400004)(396003)(136003)(366004)(52116002)(38100700002)(86362001)(38350700002)(8676002)(6486002)(8936002)(6512007)(26005)(186003)(16526019)(316002)(6666004)(1076003)(6506007)(478600001)(2906002)(5660300002)(66946007)(2616005)(83380400001)(956004)(66476007)(66556008)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Nz3qcKZm6CymuGWcTXKruAd/4IralKfsbddB8KiiWzQ8hhWL8I7X+odAeDuz7u6kDr64ptM4+fMsucoAQYroe4qRtWAsnWxCjhFiUn52pHLUGn4aY/wfbDQH5KEWlfsDauFSiN4YVqRSR2tTgpbZJ24ftIDVnQo2rM3c2tOij/ZGX/9TCUtaLbFqVbLHKLeAedcH7iEMWskA++Z4Sn7NJtvSABIoxCSAAFOkaOHEmyiLx7VTHb0QYbEnRDCTQ+XS/ozJOTH5+2IPDLnetDGsSIDX1OE7wlB9mHpBlE9InE4uVsHsZ3bLOcllMgRcsFpVR0FtSBOxmvBiU/7o8p2FI5FOOMhoF1i8xv0wlXP+C1sMXnv6i4OyPy3z0IQcK9T4/U1dNB+MVh80plXx7n4qcX8+JHP1Df93LmMA4f1yFvtqCJsWTWOj/9GtuKo2sxTawiOSaz5IS24I9bDXOke/k6k+fvliOJ6vdWnBNVmbt/oTs0yTkSxKMsle2dzoZksHcIfHzOGXu27U5cA47T685+akswHyUO75juFMJ0EYu1391lachnnyLOJdg3DPbX6s50EqrbfRr9/s7lsZFVADEYMQIwxa/tH3Rt92c+1UrTHmdiDq1/a3Wp18f1OXsV4NL630O41P8vuI42QkJCuwpdsQVxrfhbf86pi1hSqOwdx7LCzpJcGw/HbZoT/V1kkUClzvM6hPVAtuh+u5LxsS0jxO/dQRc1QNTRYgyFR16P60dE1JhmT0P99Q+TsC72TlP0QT4Zj6Ox8/pJ08Jexs/eVa8F+ft3OrWtRVmIOSwKl7QCtuQ/uIUGnwRg3cKJZeWr2qInWz2ccRMN9XFYgkFbjBxJgP1bWEgimoDqOiAO7QPXpMCql9W01N2u01Jg9iwbk0PW99upG8eZtWC/6PqhWpx70zSAc840a2igJq7vONJ3yfF/cWWH6zWfby2YRXSMTbqJU8PIf1AGQeoC+KdZO3dMXN1FtuXC5rwC7RWGxEvYq1/BgZGYQhfaj9nyu4JDLsFuRJS/xxuj4AI07tv7epd4SrJCIBXsRspF/LnnEz8erB00pWZLCKVsrnsgVtXL3VsHCV32Fn+xN+1PkKdCDpqYpIlhvYfVHxIShclV480x12lhvndfD23d1PX3PL+VVK/wYEfOyA4tRY54mWpqZzlL6AlVtmhubDNea0QJRATDcTsyjSKoeSMo/YeNbgVVAASdWWUOrcxzckoSbPa8ujHtNydKSy8mNhDsy5c70+pVgNpH95BbhinYz+OJlKYkwC+h1sffB8/M35tRIvASpJJGyFnc5g6NSDhiwrnHuXoYc8jEKIEWrNO0DCMzS4 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: db8ceb0e-bd69-48f7-481b-08d906439150 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2351.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2021 10:35:52.5616 (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: AyrUejYoTuSFnQ4qned/MChnyBE5mnwsvqPH4/UFgVxcZ3+LWaEKCRmjj3N8AT2e2FrsTneM1GkYlOUJCct1+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2192 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210423_033557_520926_93469E18 X-CRM114-Status: UNSURE ( 8.57 ) 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 syscall_get_return_value is defined in syscall.h, implementing is_syscall_success in ptrace.h would introduce build failure due to recursive inclusion of some basic headers like mutex.h. Let's put the implementation to ptrace.c Signed-off-by: He Zhe --- v1 to v2: Call syscall_get_return_value to reduce code duplication arch/arm64/include/asm/ptrace.h | 3 +++ arch/arm64/kernel/ptrace.c | 5 +++++ 2 files changed, 8 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..2c84255e1e41 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -1909,3 +1909,8 @@ 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) +{ + return !IS_ERR_VALUE(syscall_get_return_value(current, regs)); +}