From patchwork Tue Oct 18 19:17:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 13010962 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C5ADC433FE for ; Tue, 18 Oct 2022 19:17:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A035E6B0072; Tue, 18 Oct 2022 15:17:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B3766B0075; Tue, 18 Oct 2022 15:17:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8060B8E0001; Tue, 18 Oct 2022 15:17:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 70B0F6B0072 for ; Tue, 18 Oct 2022 15:17:34 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3665F120FC6 for ; Tue, 18 Oct 2022 19:17:34 +0000 (UTC) X-FDA: 80035029228.16.B431B89 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf05.hostedemail.com (Postfix) with ESMTP id B0A9F100030 for ; Tue, 18 Oct 2022 19:17:31 +0000 (UTC) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29IIECTR020281; Tue, 18 Oct 2022 19:17:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-type : content-transfer-encoding : mime-version; s=corp-2022-7-12; bh=CmmvWBe9k0n2pBK+G+gQCTNMWPH0bfV4/6aLkJHOaBI=; b=M3by023Z6BFjHX5svTy5yapY+n2dq8idnOE7K3aRDUX6y1JyJsBIts+ahtqSF7HFdJGa x0Ooix1RsGpu3xhJ+FHNR85c5tKvKsam7fIBtHr5WCtZo/OjVySYLpGjgKZx1RG7rRq/ xuwemH/WqsRxlh45ruQX71g0VPL0xOHzz53mS8qGSiX4pLrcaYktKWF5E3XZ1wq37bj+ ibvZAnbIZKEXEq+KRIK6EjzW5mKEMANxDxvsrtTL7OaEXhekyiJVLIzFss6n2j+45EH1 ofMCQE1qjZnCW1W3+jgOkTmsU+9vx4hkluaNsAgiWZR9Qju/sOSEc4YOG+mhv3l9hSsE Mg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3k9aww3eng-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Oct 2022 19:17:16 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 29IHK7Ca029254; Tue, 18 Oct 2022 19:17:15 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2048.outbound.protection.outlook.com [104.47.66.48]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3k8hr063ch-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Oct 2022 19:17:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L8gUvo7puOlUdqi26Q+pfTqcVK2K4RYPIFqPrBp2aBq1JuvGUFAPhOsnUb9VnSF3+efg2nQ7u7PaA8F9aYlrm4qRjYXG/pyhANiHEclCgfPKitLrF7JfLY0Jb4Rbwjf7pujblOOlHpPZFXpXQ08Nj9ZIPgexB73cFkCXs5LnzG0Cgt0Zzwjh3/Ofc1emgw+0K+0z9yOiBSQzR26fQPmHzhMH3DokA3faVSvfEVz/Tt3Ddd6LceOIxXTxt2Ih/3xErv5EugrBhBnIDBNewoOuzl38mEjrnNmw1IoT+ZJvzJmsQG/VMbD5jKsy/8ZLim/8dyf9P/lgLwRZBkX/hstsNA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CmmvWBe9k0n2pBK+G+gQCTNMWPH0bfV4/6aLkJHOaBI=; b=QVEKxarvoCk10YKMwaNvTeMQJjjNS77voc8qvxk7aCkx+bdtQNSauD8qac7CI6OqULsqz0frTMv3tDdkXV3KxVYMN5x1e+tJsVgpHpFTl6Uk7nr3yj+K1wLvVAJNfiHlupsbpcAXDH0rmYRj830aYXSM5rd00YpAlwxex6v6rZE9x3NXLCQjuMcSSDFRz/D1QaoUKJaJ2j2eJ8khP19GK6Zc/47olDhKCJ6Rbr2WNxHLjhndttZ91xp5h2b/h+1qOTngcM8JexkwvSdjJPHXS+sc12mvIsqb0gXvSD80uZYnK3PD5MHJuuXasGjvEN/jbLG25dV99fq+ScrUe+yopQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CmmvWBe9k0n2pBK+G+gQCTNMWPH0bfV4/6aLkJHOaBI=; b=vfp0q4HxMwO7tK+bJqG12rAjWZZQEZ/cxOZC5ZNtRetQiTPSEXYzxmG+N9MlRBefwGxEPUT4XSv/PvmfeiycbUsYs9K2aTLKVzIrJKtSx6/YSpJeSJKWvCoKm1yknhVr5wruQkQ0gXrv/iB8b1PKdm8Bjwxmid2yrrlKqHjHkUs= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by BLAPR10MB5299.namprd10.prod.outlook.com (2603:10b6:208:322::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34; Tue, 18 Oct 2022 19:17:13 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::f378:f1d0:796a:55a1]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::f378:f1d0:796a:55a1%3]) with mapi id 15.20.5723.033; Tue, 18 Oct 2022 19:17:13 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton CC: Liam Howlett , Liu Zixian , David Hildenbrand , Jason Gunthorpe , Matthew Wilcox , Mark Rutland Subject: [PATCH] mm/mmap: Fix MAP_FIXED address return on VMA merge Thread-Topic: [PATCH] mm/mmap: Fix MAP_FIXED address return on VMA merge Thread-Index: AQHY4yY6wKFTDfH980mQOidqey86dw== Date: Tue, 18 Oct 2022 19:17:12 +0000 Message-ID: <20221018191613.4133459-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SN6PR10MB3022:EE_|BLAPR10MB5299:EE_ x-ms-office365-filtering-correlation-id: 6669c603-1626-49b2-f4d8-08dab13d5c90 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: TGnjHdjBXQ1DBR68SOR5xDNcMPyDfIZHJK/qd+h86mbE7O2wm75oAg5L+CADtJbfSFUpCnyBEFU3jgakWjHfA2aKixLem8Qbf+8urGzcO/4SnDn2enerrGcShTCCjdL11ht6D9J3gEF0zdNGDyaaiA7bxRjluBidlU47qeaJchvmXJ4tPM5Ztma5oY4m9ST8XCnxnkqi5P06/MsKMnCnt5Kn3aZbULUVb9I4uCZJeKmykWbVQ4Nqje8vQjY9aMlzUy7OxPgNBdLPLbU1PmEltyB3tdhZVhgGIRxfnkdystBW5VWpt3ppdILOUf4N2b6mgvDemUvwaM1pfUmNQn9ipLprSRfJdgmYoaAQRA7P8cP7KWJyMU865MMNTvLJ8/+2RaGdUe8qtKD+DWSc4U1rJbLdE4fAXK9WMeNHJeyCCzwf4ScQKH10AKNc7AGSmFu9j1bwuBhlvxOwypXADHeWPjo4+eZR7OUhTqGdWpc5EcaWQozXx0WIhJQiXNfIAiCu5+Uh2YM19IGvJtm4THQDGKd3tDKBtv9VgfK6NGq1elX0mKoZlmGTs2K53+D7tEvkMCSNMSIv4+vovE2QEv4FkBjA9F3uX0Rj92E+M2h0+GPsO0SZ7ueNhpF0TcH0+qG9NshfBLf3OEc78TmWsln8lDGX4bljm8DeDWTbCzIRCElly7S7ZC4qPMG/oG2+UlMQMfvkSIdWafEMowCuSuTJZGnM3s5yCm055KJAHOYvK/3ZaOp6NdB8EjK50gCxKABqRIuNrYn8uaU2NmtSdj6pbl1wTR0FrxiONobl4rPyyZq3brEGm3J4gWmhzNldiG1QQ7V5xOYxRLBskBpNuCI2FQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(376002)(396003)(366004)(136003)(346002)(451199015)(44832011)(2906002)(4326008)(8676002)(66446008)(64756008)(66476007)(38100700002)(8936002)(5660300002)(41300700001)(66556008)(86362001)(36756003)(6512007)(38070700005)(26005)(6506007)(122000001)(110136005)(2616005)(1076003)(186003)(6486002)(966005)(54906003)(71200400001)(478600001)(91956017)(66946007)(76116006)(316002)(83380400001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?fozs4ZgWbdddzifqIrH5fGS?= =?iso-8859-1?q?8J6SzmlaiCYDcDwI7JdzFjbS1LwG1jBsLOhCf1OZS8gGBiQR1hiiEv7nr9Io?= =?iso-8859-1?q?TRCbLg7eMgBNxAA7UpA1qMK3KMsPvaq9R6ikluWPlPobVKQy9DTwubh1K/pT?= =?iso-8859-1?q?8geScJKUgc4tKouyySycD1cx7Thd0lfiAgOZk6d/jzyLaZjFgGzUx0zsy5/b?= =?iso-8859-1?q?NYQwFTgN9EmBGN2g3f5c9HT3x9JV4eK9SEyfRg7ixk/rzfyDMoouRJrfLrIk?= =?iso-8859-1?q?VCgfYt6hyESjO/ye9yNJP1jUoYiDHSj8f4tVueq4EytN0w6Tztde830e3tfV?= =?iso-8859-1?q?aVQGwYACJHWnyoovEP1/YTaY3UBhdAYkaN4PoQ0DUT9vfttxqhmhTTK5D/i5?= =?iso-8859-1?q?Q5/ABiHvczxwAnvwhj+dlq5ycCK0shoIjoWv3lQMl+KY/3BFh0ak6wVna9BM?= =?iso-8859-1?q?2pjos0qc0cTj6KKbozrjHUkIUsyUmFyrbMMHWNOUxAtYBrno6/ktdjPyYct4?= =?iso-8859-1?q?2AuIy1Ow3UQ0Uzy+BkYNqCYyprOkoim5uI68S6rotMO73g74gKAmDD1BOdkB?= =?iso-8859-1?q?tPeZWqWo2PZyyHKXZjxBSEKm/UMXF+8xOlrJkYSza4Fn5hS4uVs67fTfO/AT?= =?iso-8859-1?q?rI/j4JhMnDUZWeCTgxWHHguAK404US/94JGgYZdvy7pHL+LQXIOStNlI9+3L?= =?iso-8859-1?q?zKDFZ0oEvM0x6PFLKK9iSOy46oAlbGaQb1s/bWS2KKErUi/OWHzr8pZHsevB?= =?iso-8859-1?q?fP4DqpSmV2BuY7HhGqqRm3nUrTPihm1B7v6EZ0a67kSb2BYaXwRgM+9arsl6?= =?iso-8859-1?q?xk2i/ezZBBZi3Lu8pEekWACihh13UiV8YofgsLCKZDAA6jwYvE9ZRXA349I9?= =?iso-8859-1?q?dttl690a4vQnv7fv0A5FJnZQGGOSsN4r03e82BNAU8kStNasXvVTm/wEjh2+?= =?iso-8859-1?q?nbGbWRJxPyn6FKo4LAySbyLs4P17UBn1BAXrIax4Q4yp9SUsWttBwLGEYqPn?= =?iso-8859-1?q?EqVka0UGCb49hwmtpOR0uDMAe6CNk4KYAS3All2O2wlbJG21aYc/8/JVBrWI?= =?iso-8859-1?q?UC8vSok28Z9Z8NGgKv46y82pkc0njQoGDNOnMIT0wZzBm1EFel9x47XUYoXM?= =?iso-8859-1?q?ks6R3/VEPIZ2oenE2BKk5LwpbW6HK7E2ELVi7tgnbFnh0eCcNnRR5PKHlIY7?= =?iso-8859-1?q?d+cx1FMuSZ+NULh1UhnsvTC1OCf7DNMPvUQuyi4yuJtFbx7Y0YUfDSmrPqAr?= =?iso-8859-1?q?KDbCKUt0OQ48w8uG+e5vjtG1LTIKZ3fTovhU4qhcUosOVrCfw13Q6WwB4RFU?= =?iso-8859-1?q?irgmrmLZfadsAl7x48SBwEIydNej5VsMzbkObCTF7kBLtI6Z82idS1BMrw7t?= =?iso-8859-1?q?62d9L2zPRq6FviCjXQaApjCccrI9umPoag9d8CAUrnj/vFK0zGn3NSL8+eKr?= =?iso-8859-1?q?TIyUXzzCZ/fuTxmZbXvqKL+Uq0DJpdM06NjgP9whj9/nsnu60a6SxKIzuwem?= =?iso-8859-1?q?1go/Yu8ApqZD4EexUrfpKEhTwhj9+Id25NnqBFfR7bckLpsKOUJIGPirUm1t?= =?iso-8859-1?q?Tl+/yU/Q/YuXdjRAQev35ic5ZxL0Zq+lpQDgYfUAZRl5PNcXRdnSg/tX3HUO?= =?iso-8859-1?q?XzVbA3wkWmgrbGj57cBVIa9RKhgXVi86LmcAYbw=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6669c603-1626-49b2-f4d8-08dab13d5c90 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Oct 2022 19:17:13.0002 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 5E5d9wcS5A3H6jd7n+FdMtL6MFUw9zB0Iw/egsYeCTnr7d+pdhFx+aZgHbxCryAF0/BMYieOhoXpgy8EtCNpAQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5299 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-18_07,2022-10-18_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 bulkscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210180109 X-Proofpoint-GUID: OZg67XYjaN6ocAOKlp6KNpurDxOQIp_T X-Proofpoint-ORIG-GUID: OZg67XYjaN6ocAOKlp6KNpurDxOQIp_T ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1666120651; a=rsa-sha256; cv=pass; b=2NGwgms5IswdrBu+G5cTKKzwuZyYvedoqs6F+ZtgVo2bwy86r01htiSEH0t8AoqFGTTdNZ KyZ0Ty7G6NFPvfn3QMS02vz1XpelFdpUjVjM2SwNu0vimzU2QijOI1mwf4qujfZaKj2WU9 xo8bUpgSMEI4trGI4WR/B8KmZZNQhyQ= ARC-Authentication-Results: i=2; imf05.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=M3by023Z; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=vfp0q4Hx; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf05.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666120651; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=CmmvWBe9k0n2pBK+G+gQCTNMWPH0bfV4/6aLkJHOaBI=; b=Mc0AaPonI6Ky+efV8c16iXyZwNFen5xDAFoHQlOHFYQ4jkr99IvdXfQUn/1ze58+K8t8T8 eOY5YrOMYfhEUF4rEWd61kERKMteuUOhU+MlEaBPO9IuYRhLZbmm08KpZ8FOtLq2Rj78+m DXiGDjfj1teG49F+9VcXfl9kbco7Kp4= X-Stat-Signature: pimwasu3igq8sq7kbietna6n6sjsds67 X-Rspamd-Queue-Id: B0A9F100030 X-Rspam-User: Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=M3by023Z; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=vfp0q4Hx; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf05.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com X-Rspamd-Server: rspam11 X-HE-Tag: 1666120651-584024 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: mmap should return the start address of newly mapped area when successful. On a successful merge of a VMA, the return address was changed and thus was violating that expectation from userspace. This is a restoration of functionality provided by 309d08d9b3a3 (mm/mmap.c: fix mmap return value when vma is merged after call_mmap()). For completeness of fixing MAP_FIXED, implement the comments from the previous discussion to never update the address and fail if the address changes. Leaving the error as a WARN_ON() to avoid crashing the kernel. Cc: Liu Zixian Cc: David Hildenbrand Cc: Jason Gunthorpe Cc: Matthew Wilcox Link: https://lore.kernel.org/all/Y06yk66SKxlrwwfb@lakrids/ Link: https://lore.kernel.org/all/20201203085350.22624-1-liuzixian4@huawei.com/ Fixes: 4dd1b84140c1 (mm/mmap: use advanced maple tree API for mmap_region()) Reported-by: Mark Rutland Signed-off-by: Liam R. Howlett --- mm/mmap.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 42cd2c260898..22010e13f1a1 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2625,14 +2625,14 @@ unsigned long mmap_region(struct file *file, unsigned long addr, if (error) goto unmap_and_free_vma; - /* Can addr have changed?? - * - * Answer: Yes, several device drivers can do it in their - * f_op->mmap method. -DaveM + /* + * Expansion is handled above, merging is handled below. + * Drivers should not alter the address of the VMA. */ - WARN_ON_ONCE(addr != vma->vm_start); - - addr = vma->vm_start; + if (WARN_ON((addr != vma->vm_start))) { + error = -EINVAL; + goto close_and_free_vma; + } mas_reset(&mas); /* @@ -2654,7 +2654,6 @@ unsigned long mmap_region(struct file *file, unsigned long addr, vm_area_free(vma); vma = merge; /* Update vm_flags to pick up the change. */ - addr = vma->vm_start; vm_flags = vma->vm_flags; goto unmap_writable; }