From patchwork Fri Apr 23 10:35:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: He Zhe X-Patchwork-Id: 12220083 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 8D60DC433ED for ; Fri, 23 Apr 2021 10:38:27 +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 E3C2D613D7 for ; Fri, 23 Apr 2021 10:38:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E3C2D613D7 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:References:In-Reply-To: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:List-Owner; bh=p5OjKkRye5zjuWWHboOYvf1crfGandQD0XcBQ/Zl1Ss=; b=G+AFKWRZYQqqcWPPv080U0UtZ TaUYyWv+8FQ0DVj/L+ur2CRNL5wxAGngKSrpCYrZ+vM7OvGEt0IMm15gUbTwJY/VyOoPGq1zNFnXR iB09T/lA1bdJkpHfK/B5OlYyuEW2r0HjTvTWH5hJBaLsnwXppzlXCoKJTv72+qIyGzZ97OkHd4qfu XEy28NunS+MtS74mnBekIkwpHNZiKktkTk/yeCYtjP2SFTLd378k3Bo9bkz0h11P9WjWJns4eqM4O KpPanswNrBilLsUhTezGuAAJ0aWeTaMX7h/jyY9GxIpVXaUKGPZol2TRG1m5THgEqdEXbZ1Nrttg8 gzBrSZWQg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZtAV-001JzJ-QU; Fri, 23 Apr 2021 10:36:16 +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 1lZtAH-001JwO-FC 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:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description; bh=EH5wqHUN9VDLDKFW3Rv5PrsNRB/SD0EOsVwV5A//cdk=; b=VHGmoXsSnvTS+86OTWueYqKYVM hChX3a9ESdgcEKpkh8OzLhpAYT+VIqvM0v+RJCpSgBx0GaWwWw63WxY7unuVer2OTuHVqRffQrC+w sls8vYnm5gKGjKpNtDhAzbKfFoBw6gCAs5dHk5UeRIh5Y1Z0mMPZu/260IIJ63l1mPZGjTvYohoEZ Up5wLwIhKahxFbTExUGXv59ZsXAoXKjAz0VgNqSEOvamPb1CJgwtp/cArWSWf/HifJ7a9gD8MStUB WwEGMEW+ClO/wZB8tm3TR74LYAcQz6s+ffLenM8SwhJ9RfF54zyi2Cs8GCOA4dw6+4uxX8ldKN0xd PfUNFn6g==; 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 1lZtAF-00EKdZ-2K for linux-arm-kernel@lists.infradead.org; Fri, 23 Apr 2021 10:36:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I3beXnUMwXZKO9QWvKf0hHw6WeRx63XEkm9V9LMxztyfif8Gs7kSy01D0ku0iiAuX/dkQMi5G3TGHp7MCeSEbMmY1n6hHLAv9JXZkEToDpcuRGqPr20qqknDoyiDB9Dc7a/Hhe5NGJ9GZXbOW6H60kGlu6P8316p1p++UFtMGeD5tvImdC/MbOMkVOOvn33Tl+2oBCGtSRUblG+dztyI4lRH6FMg1KNsl83dmoyPvVU5hVpWen8XS6SFX4YWnVnL3smQXaP9aHeJv7Z+0By2nKi2kGzRUys2MRFOLq1u9FMWXtCG99VT6nDImObL0qKiNFabRShfc2CdUlbGkwQDVQ== 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=EH5wqHUN9VDLDKFW3Rv5PrsNRB/SD0EOsVwV5A//cdk=; b=DUic4RALXyXfa90HHrMiXmF8dkC7XYXdJonkualn7Av2jmgM+9aC0GCoT7tGOxI0vImxaFhR0nu99Ldr/3jOD/PNgkV3XainyvH0DXGPjBsrPqfCUT9uhhY2ODps3vwP3avaXFGTnjdgctYIR3j9VRhnPnf/QTkqsXn7yJnBg7kAx/cIOJ8JZlxFbi78ucJg4NxqsT9uted8k/JkkRtimgPN4UtJm90zNYGzfgDgZsCXZyrUVyGTY+3Vnjt8pxeLSu36hwVH9ltn1PIzaHv8+I+ttnb0dOp/8gyc1dQ96uyXL2JLu0wnfAcA35TyHtRj33J7acuYNvaZ26fGwsxVZg== 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=EH5wqHUN9VDLDKFW3Rv5PrsNRB/SD0EOsVwV5A//cdk=; b=jAHaqbG10UaI/BJmgTNM3OZ/+9XM4X9QcBTXXyYBZid83N8e7Dxh5UkLwLdDE9nsocDGr9HhLafOznVxVZUSFVoJStpaPwY5+pi3jXRjYJ8uvtCAzUpP7qY5cSo+oX05a21SAqb0+03a6J7LKS2+H8+D1PKwCAEIKy/D39fzqNI= 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:58 +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:58 +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 2/3] arm64: syscall.h: Add sign extension handling in syscall_get_return_value for compat Date: Fri, 23 Apr 2021 18:35:32 +0800 Message-Id: <20210423103533.30121-2-zhe.he@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210423103533.30121-1-zhe.he@windriver.com> References: <20210423103533.30121-1-zhe.he@windriver.com> 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:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0f28e30c-dbb0-4d32-afd3-08d90643939e 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: OQb4Xtc3URswsbP0UHi73MaMObWyT5y1UWASUG3g7fuhwEL4EYMstfjAEbR02MTSjoE1t17toiZALySrkdRnM4ReMMasnl94xz77TdNOmdsXDi2CyKYvqpRSIQiFlrQfrM2vQwONsteEUGPNMbp/YqVVNrlES8TIcKhwxohEyYzckmuy/3S7gGee8DNDIOvj9TU6ZMcdDHY7mmZgN22kVTTTf+Jsvk2ru7Fm+d7TH1T94N8B7u+R3A2Gp3iR6yyoyFsDIuDz/8qvAOapWxyAUSw6Zeu4QKvRBL10/vjAjwGcomI9E7SQLoYEd0fhruUr8D5CxGPIR/u/JjmYukbPmjT1U32uzXHyD4MC9g5YUwKSBqGt78kwVzp2OnebIzAVJC1KW9vlLV/KvmSQjVto87Y+2Io95llw+VM7aSiCUZmEi/UPHOSRti1tWKm6C0GgEPArhyGbT6lcvYG3lAWZPSEm2vu+5EZOszhKRCZO1UK2Yg70SVTACDX3yoYbEL/bZQ8rToD5h9JZnUXvgT0Y6IqaLyNJH1YasoMu9WaRY9RlAgwQHX5cX5kvJjRsEcMNbonNUh58MpjJYlUcs4yXgSaWWz4ezkfLkixz89MqGjptjVtip7+b2JeZG8Ot3XFoojysb3148Tvp1whT9ikeEWMK85Dw235Ww5pZCzOpdMs= 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: caomrY6hgNAKBbvoXixZHPre/wmowBpTGRWkh0DkadTgIBDXSJtUcbRGEhX/GgX1ODnjOCNEeHKXLBifmgK4n1FgfDN5447Oowvq4s7fUOqxGDFsJsbEZo673dLePjhPgpLowtcx9qIXbSkYZ8K1YN/OkoIoGR5zlsKx+sP28sF6aJogIaSXyzELnJtZV7zjVoxhpjBeDjKaGJq6Q659Bog3S2avu4m9GZ/EEeBnPxU/DbpaeJz2otYVEd3Map6IUZNlZornPgFg9ElL+oYipRKIVFqzsE7M4ENdYzOnQbx45D/KMmvEvM9/zR8/zlBDtfGWQehqyBasv8YNLMOItxijoLPQrGbXEl96OWGyD0FsetQJ7s9NhOcvpmDr3K/GU8e8tO8WPQ+iDa9e+N6WeL/Aq+Aj42POCSgJUd388i/nKJp/d/44Yl0+a4mBoGpQlORlbmAi7Upc0W4RdrnyD7Vtm1+HY6HEc9nmUHh80mREkoCA6ASUMJEEhn0BNV26+2hfczd7YaeUuQQWnIYr0eUerDUX+N8LPdijcpZ9uWtzdQ5kn9oV/l2w2LmB/8Pt5UlK55eq+8jvzPO0rS3gTH4J5HWxnLnGEE2ThuZtKcXxhjUptPDMau9XESHROF6xl5RS7Wanxbsb2UFVYpuLZr4KR3U0nw0kWreaq9uuNspWiP4LvcNUL2FsXT54tSCPD15fm/ImTRfIlhgPB+xysCgbSfn7qiOXdd7kwzTtsCYxHahkZAFiGHQHrebYjzo/JHArxryBppCi5i87At/SXBYUvJL4f66fO5KT72gJKkl2ZImrIvBcR28UI9goefrzkndlp9LyLaD4QUMqylktqgu93Nkvq104ETKxYzrvTtfvBnbDzJ9ztIXivtyEphWi3IXfuf98aW/SvvSc3a10UM7mIEqBJwrToWNqgml8jLtpJ/B3lzfim8gzzDAYvcb3Wv9zsPaFANmTQSTsaFAlikXtNgHQskY9VuCDL+lK0t8HUntopc6MBNEu5JpYq7tfrHSRmmXt4U/98jTjGVFza6x0Tip2JhJ5ns/MDBwyJkxOLDCmqED2F5dUguYQ2V861SPwWqquf/lIBWj6LIGahI85clwvh/QGF3F14Urug+uuDWzLiHiTqksx9l39CHPl1AbEIFx8tHVmp0Kue2BWNenlxFvon4TY6MnhGxoN8Dy762ZPepoxK9845Ux2AZxLoKzQZkpHYXyaq0q5KiEpy06ps+ih/0MzCRs7jtDpUGaFFlKOzFShmdA7S/Z7Y63uJngIT+lm3KooIzgm3gkif414gcXPhDC76llcHcZajIfkFzCb2Fi6VcjPBwVLbKoE X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f28e30c-dbb0-4d32-afd3-08d90643939e 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:58.0672 (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: GfBm4xr20QaNeidFkyp8vSIbKrXJuxQ/z22S6gDQM4TihvtS1/IEcGB0LxRIsRq+dZ3heaALeppvLDTmfWOMVA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2192 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210423_033559_132001_0556B99B X-CRM114-Status: GOOD ( 11.24 ) 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 Add sign extension handling in syscall_get_return_value so that it can handle 32-bit compatible case and can be used by for example audit, just like what syscall_get_error does. Suggested-by: Mark Rutland Signed-off-by: He Zhe --- v1 to v2: Improve error code check suggested by Mark arch/arm64/include/asm/syscall.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h index cfc0672013f6..c3b5fca82ff4 100644 --- a/arch/arm64/include/asm/syscall.h +++ b/arch/arm64/include/asm/syscall.h @@ -44,7 +44,20 @@ static inline long syscall_get_error(struct task_struct *task, static inline long syscall_get_return_value(struct task_struct *task, struct pt_regs *regs) { - return regs->regs[0]; + long val = regs->regs[0]; + long error = val; + + if (compat_user_mode(regs)) + error = sign_extend64(error, 31); + + /* + * Return codes with bit 31 set may or may not be an error code. + * For example, mmap may return a legal 32 bit address with bit 31 set + * for 32 bit thread, in which case the untouched val should be + * returned. Otherwise, the sign-extended error should be returned if + * it still falls in error number range. + */ + return IS_ERR_VALUE(error) ? error : val; } static inline void syscall_set_return_value(struct task_struct *task,