From patchwork Wed Sep 27 16:07:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 13401332 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 78C3CE82CAE for ; Wed, 27 Sep 2023 16:09:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 07A2F8D0094; Wed, 27 Sep 2023 12:09:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 028878D0093; Wed, 27 Sep 2023 12:09:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D96668D0094; Wed, 27 Sep 2023 12:09:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BA7B48D0030 for ; Wed, 27 Sep 2023 12:09:26 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 87201A0D6E for ; Wed, 27 Sep 2023 16:09:26 +0000 (UTC) X-FDA: 81282862332.10.59A1E3C Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf05.hostedemail.com (Postfix) with ESMTP id 38728100017 for ; Wed, 27 Sep 2023 16:09:23 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-03-30 header.b=BuOaCPE5; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=m0hheYBu; spf=pass (imf05.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695830963; 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:in-reply-to:references:references:dkim-signature; bh=wKLO5aowMtFkN1v6flI3U2j8ilZzZwu3h9RuAvaF98Q=; b=Nos96N5yH4WXQveKL74XJeBq5HlISoe8uecB7CcVqU1LfSaEN1qt9f72vDzkvEpVECd/Nz aDQUOcyMlMpvDpgiRDFa7i5uaVI1J8USVVyXP/PCg/F/oRTsREQWBo5KLjpAo4Y85ZR+V1 2WHUBKbCnTmZKBmE2IO9i0vm9FnrAe4= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1695830963; a=rsa-sha256; cv=pass; b=wYoSrgUEylunPFV2hU2IuOdfmg/7nFl89CMEqt6Yw9UKj6IfcxDzZIZO54iEmZ2dFJeHFq EkTdsxbGEDo0LyzEFq4aAFaEATpbzqfwdCwiTFShVATdEwHpxUv5K1l5RkvK9dRuXSv5Ia RsSbREWV0149bReYSmqCQ8gIzLnS82s= ARC-Authentication-Results: i=2; imf05.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-03-30 header.b=BuOaCPE5; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=m0hheYBu; spf=pass (imf05.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 38RFsmvw006126; Wed, 27 Sep 2023 16:09:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=wKLO5aowMtFkN1v6flI3U2j8ilZzZwu3h9RuAvaF98Q=; b=BuOaCPE5a0NvoY16Bo3RcThian0yWndqUHHRIjjmzZbZ0mABEi1aQeG82RSXYyxKbBVf pFlISRxFXwKEbmxrhyDzWjg13kft7OcOww4wPuNf0RDdw63sHYkZn/Vy/ECJxpy+l1NI HRpoA0nIaVysbz1HDgNeox60woiIA26bO4VBZavx7FEtJSN7ugR2lGRLyCYzkP+U34Fl wa++FRUXikWobqdK5xirFmHGMDXjCHIN5c3w98uxLk68y2opiUosFS0IgfCKoFaQ2asX uE5d2LUL972zJWLPXVtEFL+W2ZR0vbR/TTbzv+j2LsloxxJ56ncU6jDFu9C9NKWUpAEK 1Q== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3t9pt3t017-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 Sep 2023 16:09:17 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 38RFQw3t021222; Wed, 27 Sep 2023 16:09:11 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2103.outbound.protection.outlook.com [104.47.70.103]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3t9pf8fdpq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 Sep 2023 16:09:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jna6sIBtWOHJlew6LrZorg+N7mxEdRLIGCbab/rwDrTGMIz67FVkR9EoYRJvR4ehGUzyJrMEo1pqQPWvdaobgxcsgm282ZCpKxfFFxgRooMsT/eR7SOpFxhfUNl1XR4gLW6BvQ8Vi7EoSK6OM2P4ybdtHooWw1zziv76dP+87IWLtwfYjIX2yAigz0tlkuTSCtremGNMygewDN42k5289Zd2vyGkpVAUJIEm/nytR4ouz+y+LC/lwwc2jkG0VrokbRo3e7EKj3U/XsRwDCxJZxpv3M9+3oza/JeAsKjyXzx+XnRNKNa68lbFMVtWtwHy+vfcIEhT4bP9X69LYo3Lfg== 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=wKLO5aowMtFkN1v6flI3U2j8ilZzZwu3h9RuAvaF98Q=; b=eadwhyJ058Ct8Sgphu9Odr36RILfnadmEBf6fWajnTmObEzjB5icNnMhKqwcpJzxpB5z718+8pZ9Dha+Y+ZbcTBw/zSJlBIa4sLgDCNNZVbFw3zW3xcZf9ZfhfqvOffJg8p9QWq5h/p1tQjAal2AKz3ybNrKjoLFnyeUPGgvLeaj3ZXJpRQ2yZxi/NvfMiCTqKk1gbqgboZiITsUZ8rkhBHOUc4xF3YlsirNSnE/nTamqkpzejIRiPF5Ur4uzbpmoLgSHLko4phICwigteOwJoKOXFZegXHSRgZ3+VDJS1aVMlFlAj437krDiVPkzxCNHSEt6xS1jfSN/57NY5ZryA== 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=wKLO5aowMtFkN1v6flI3U2j8ilZzZwu3h9RuAvaF98Q=; b=m0hheYBujpxtq566mTbKEuyk6CjFbDHweCj6+nYfodXfJnFTlRskaxXo5xG9xjEAgDWxeGLVrjanfXAI99zRpTDFFUQBhUCrhMnAFU+Y+YdUwujW9wXZKgeblE1oUgsiOx4A1WzQRC5MTUdeCsgJ52vVwMl63ixeR6BG42NRBfs= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by IA1PR10MB6122.namprd10.prod.outlook.com (2603:10b6:208:3aa::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.20; Wed, 27 Sep 2023 16:09:08 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8979:3e3f:c3e0:8dfa]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::8979:3e3f:c3e0:8dfa%4]) with mapi id 15.20.6813.027; Wed, 27 Sep 2023 16:09:08 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Jann Horn , Lorenzo Stoakes , Vlastimil Babka , Suren Baghdasaryan , Matthew Wilcox , "Liam R. Howlett" , stable@vger.kernel.org Subject: [PATCH 2/3] mmap: Fix error paths with dup_anon_vma() Date: Wed, 27 Sep 2023 12:07:45 -0400 Message-Id: <20230927160746.1928098-3-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230927160746.1928098-1-Liam.Howlett@oracle.com> References: <20230927160746.1928098-1-Liam.Howlett@oracle.com> X-ClientProxiedBy: YT4PR01CA0467.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d6::23) To SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN6PR10MB3022:EE_|IA1PR10MB6122:EE_ X-MS-Office365-Filtering-Correlation-Id: 2084138d-d534-42f6-a89c-08dbbf74148e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IOgQSX7y6QWs/fnHOiPh43XePlQW2PyBACrt3D/D8H2WeDGGoutXoO11cNz3ONpQ7Ro020dyOLp6jYQ5o4GlDWQsBRb1wJsEpj2p+3iLXS9vjET5MPnZm7o/1Dj7Z2n7mDpXUPXQUZ3MXG/ho4Xk5JE+gyGehk8ILvQjfm0RaQSs0EXBwvXaCscWEJPuJ1QEIIMAbhK913RVfPRG54CIDT8AfDNusEfPJOGR5DFEn8Yrr0xgadcnqyXg3nq7IrjLVh9SKFD03n6pHohHfAxxnghgZWmOVqWgpOTw/0z1wFvgnz8RlgBEW7RHm2iuKXlfzEhSwOaQy5VBRKLNWD7TMaXPcDThjl0NsSTjHli0O+0c9dckqu/ppDzu6AdwWrDZYmoyXh9q6AofRG0xfeath5vxgkuhM8YPjj4kTBFyYwTCCgjlelmfa0w9lWEGhpT9+TIIg7Sbo/OXsyjrKAWcen3/YZ78c+Ro2MXA1/fEzV3hT4MEgpjdrtlthCMLFQWwrxH9X9rNLgituQaw4frUsEx8hRFPrD/BLEBPOtiqOMKqhFDJZ8FyoO/g1Bm8P1xj 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:(13230031)(346002)(136003)(376002)(39860400002)(366004)(396003)(230922051799003)(1800799009)(451199024)(186009)(66946007)(66556008)(66476007)(38100700002)(6916009)(54906003)(478600001)(86362001)(2906002)(7416002)(316002)(6666004)(36756003)(5660300002)(8936002)(4326008)(26005)(83380400001)(2616005)(8676002)(1076003)(41300700001)(6512007)(6506007)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BV7LC1OIEumSi1hKnRkz1PhRAibE4SIaUftLhlk0lHmWDEHzHEJct5ki/YflGbM4o1R8FnrZ4Wt04DUzh6axla0MvRwrNeyxT9S4HvYiVBiSXWM7Fom9HTOnav8Hl1EaF7dwLO1iBVbqL3uC2Jz5NYd87/lE8dgKjEY8M3iOVT2nlerDQsy2UTP57rSqRUHz+4ua6+VEdInTUZvJNqkFtWcpMcnAGHLodOhankHnpAxfYx0M+e0bFbNzIsVnSCzyOkLysPxMPgJpRa3+ohaC7q2bbc1nOGvLhJSKGStBg9weA1QIir7UmbaN6GIXH3vWMXbozIj4fQt+hJuIt5EDk78QFRG4OtjRMkW5X8xezyk8035wYAcHNagyOLnB/6LOrEgU2kQ7qUtxB3WCIS6Id88Bbqg9G0aAQprLBt49aze2yGSSk0xZNx8EC4halohwBmp51widG/xcqIH3y1tJ4s3cP0c3SE11phrKoreOrtZEsvOEiDaIlaY38AFOkcFJmQS83q2Vig5QuuUdwQoI0+EEryooGSEnRjLiJqxO94o3vnrYInEyEoLgVlDHGw5/4CrSHF1uZOZWOtzYuq+aoWHUgewTtBeHzl8iSXOBzr0koS0tANWV63gwa3wmtoZvYgnicqFCKCg2+poen41QixiZEBfRYzUQwkoOHGPJohhwcN6A3hPGOOZCc9nWaLA4HNDBYoWIjeCc6pomBlNoZwWVd290XMhYjvCeECQ7VO9/TJ3lyM5/GqGuXbxSjns/Cz2tTml29Zp+V5njqwlTxo9+dZB+5g/faBkSUgCBAgG/MMiJMXKwKM30PPTd4pmFanhuYi67A2yRM7LDhQvdGPRXY7/LWup+hCm4/XHC7z23VcBFsqP7aru6PURPYjVSFYsedF+e3ndAI9te8ad3U7eH3hXwKyi7cQ1ThFTLy0IxkcKxjdPC+fXrq9pdv5DQ45mGRab4fAamMhMlSpp2UH6ct4XEjfz20hlzL5p6UuWO67TzYx1HDfVj6ZFPOV9iCvHYdWSA+vLKrHCuhSgIV+xz5if8S6kXCEBti0v2VcGCsvGajrrWAJIszvyFWDIZ3OK3SMh5bM3Gx3nlwouTDhnxR0YpaG7Jy2T4y99Y4oc+tp8jWK6uISJtVUKhY8MjGx0GEWzJlxhT3WFQc+niIE1kww8Yla7LIMKew69PkNmJJyk0ZBRTkQI6Y9xllEysD5cdu6hHlNvVgDzhjuer26rVHaGwJPgCaoUUxGsVmdWsOo9XrgMHPC/KDbtD+mgG/s6Ecp7/kBkDLvS//JGBlULhUXuWEbla3tmW7V3gYKFQN8JjGIUAy0ONLmXVa8voDugTOrzhAHjbcUCsaDN3pSpDrKBZD4vfuW09kLkP6FCznDVGV0dDB4+eQuO8j/aRQwdVIJgW3VqqtfwDv88CtdF2QQiSd0QZw9GiL12PX83sY+MlfXJaHKoZKZKWl8ohD5ifN1k+eM/VqKhlniLnT426rjPtudhPuCUxL115i8g/IFz6WXoyDmpQb/kUjHs1W2m0GTxDQLEDZSZ5LbuytuU1xQbritabVmpLXqmgFsVOpD88ZX1fpq/bOdzz+/hw X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: /493/iW/yaL+h4zHq5RIUoYfGmGS6JOVUEUlTupYb/uwsRDXe4Oir0gy/maJTC3XjOvAz7eOM8q93Z/BuTF0SaGy2wn+DhaijyFZ4MCEVhhjPCG8ftdvHIW9ruaGv3IEfx8/G3ImiJHEvKpbxn+tVX98whJDGjfzBy2eIKlyljgeeroDLA1i3Rn0gx5opyYJCMVSCKuI6Mb4KxjJwJarHGOCaFP1yhhgJJ5w7hX7BlJUDmX0sbbyNxoKw+WmxH+G99QLzutI5GDy4y1Od0FDF/u/E0TFMcl++uY+6iJvHcICEqslfRbOwAIMYq5NAUydyuFNTJdgOKnMQ2cuAMMmZo7qyvuDHPO0shsIn3mOPccLALYCCUjOHh87+13xWJiQLGgk+4qJuROQ2rjVMugrPKrNcqV+6EohxRX3zTJSRYJV4ndHOSeEEbn+QPoiVvzzfRz6G1RpaVOeWdLriQAqArgPLHtx2/Jv3UZBF1YQpNJ9hoKmlmoRBbToDTkrwm/QQQJrD2AMXeFdx9Sprca5WyFnQVLC9biE5XWBt1f6052NWQkZcONscmDL8JGYTCHGBxeHJUNUPOmyrBDURKN8E1T/2eL7+f9eX2sp00ZcVkjxev/TCaU7ojqUMyT1sqEtqTz+4yyOGJxXXteedcsEF9XcuPLPqrb79XHkXRWmPJ6ujP76XHLStWJ4l57YcTWB+0jnE0cAhGcp9FxDffcDar1huswyfha+6mnDTh/x62s+THGCefBG66FMK65Z/5lK4XUdTb15jEoOHS8MQT4cB1RbaTvoSBt+Xb34wtFsPdL0bBAdohB6Ym4pSghES89OnPKAeAIgK2v1tvnMYkNgWulo/UbbnaGOP1YFo27bI8PCq70fv3oE7abaiiVlVQdCdJYLP9+m4tzWphzil4RI/i/+1oLkrs5tkw5eWu8vtLPxlYDMcuz7clP3LTWMXXa3BsmHbdqFXQc658c74JjDQoILCwT9ZJGUrXaXdqfszd90bxHvDS6oO0fPqmkl7hiI X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2084138d-d534-42f6-a89c-08dbbf74148e X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2023 16:09:08.5998 (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: hSK65zzy6aX0ZDPHhnGeXodhWjVC5Q1YVolwB4RN11uSzDXeQwyMY9d4jGlIsBn7C3JY9xnRHfVnYJYHHbWUfA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6122 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-09-27_10,2023-09-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 suspectscore=0 malwarescore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2309270137 X-Proofpoint-ORIG-GUID: StTGcNikf1_B-Srv0yNwqwz89SOIiU6d X-Proofpoint-GUID: StTGcNikf1_B-Srv0yNwqwz89SOIiU6d X-Rspamd-Queue-Id: 38728100017 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: swchpwhhmeqsmegejwrp9sqbm7jie4kn X-HE-Tag: 1695830963-210946 X-HE-Meta: U2FsdGVkX1+p2fl4U7+jAABxjzxcXQjMc7OMaWHjwZtAzNU1yEIvIFg1rinTZNr72oHmRpC4CUMFehw0+5Kf8sNvCgUkpwwHuSY1rzhsYex30j7Pqlwmz2Y7WqUOEjYEd2sgvgo04lpgo+URdHdvSHOwT/Z9ZKOylouoZMXP2iWbQE9LEax5Gic+lFCLulzfoDVBS6C2OXrBZq6qT7YFG7JgenVK+uqZW8BgI/brppkQT4AJGukfLjKvKjepYxhZVbLTqzBabDbGNfT5jQ2jwyLtS02ySpUM2uryvu+ze/oJAkV18/GK3paxVZj6zBovMnGLlGY6a7s88q545ihl7D1mh1EFSrreHITVnp4q2TF5Tex2fFlk7+yT2hWJ6N5894RzO2Nyc2Nh/N8M30btoiOU8SiJbtdF2NCybaWS3QGynpJJ0UCRIpl+y7dsGv1JXzqWIKYMBO3AkmOWXgPy3DpEt5b0wp+F/Fs7p3OFjjP3kyKHuKsG3svnHbimjuoMKOLPhvQJCCdF+CnYMsABxcjjUymhoOvmRVWA8u12Ss1W0nYEL6lwq9d4ECxLThv3XnGXK95rodwzcaMk5YN5hfVAFoTdr92hQPPoKAh2SgSHLkVA1CXm6zqVg4anbCpsR2UHIxBcn0+xEbs0hpH6jcUXbGk4CQQGfn/nHRWZxkCpfrXm3eNMcEdEl5XEpccElBBINIvrtF+kJ1MJRt4ByHJUOJ/+LSqOq7wGfrKwnLGAzWUlXd+jJxYLmo87c2uaMUwQH28gFCevJzegt3gYoh3chW4kqxBlpuBmsycJ/UXY9gtrS1cqjZarAIG7KRVINuxpEqklDrNeqJ+hefTAVhq6rsF7fIwXeYrpOfhCLpJ7JN/o/iQgEBOaO0vFofwqucanUSSeTjcZrLS7C7vnaFTDojE0KktD6cuHmg8MTNGp8YLkvf49GU0ZEu+iRGvNNPPBT3wHqM699jasLw9 2gNC6jZU Pl/b/L8ZD3jwC42g5nPVapis+C+7eXAkh1bkB2uwVzuzUkscfIuBtiTt2YZP64GY2YjyHr90BoY05lTkVv5NUwfFl0jKkDHroiajQbA2zDrh61jwIbQLLV10KGDv2FjD04HJ6HloFIuu5NTpu6bY0zIBjy63bsCm5K5fEAD7XG813OgTBWKG73fyNzvyp9JGBMZyciMX7OVZwTv+zK3lBWTHJqcKwPK8KE3iI5vcHpwrcIIs5iKgDBXOiH3K6XLoOV1uUv/Hwgc4sLuwhSHSxxecqozkZRXh/LppNMammuRVemrFhb+LGWGicgTGrMhGQ6cmi+kDxH72obXmLG2tQ1qtSx52eAprzYLhwwetSleLmVOtIBPlQTO0Tum+eUM8HMUr8F9s9DeCLEzJiZeshMAAY+rjMOjt6FN66UA/5xDzY15fl1VcccpZrQ73A4TXfE1MyPi4scAD2esrXEnWiPRzbaYxx0wkvJKferg0p7gslzA4cBILlTq+iq8uHJ0kG5qC4ye7ORBJ7Cj9x2V9Ilu3gibZAwGp9/0hx 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: When the calling function fails after the dup_anon_vma(), the duplication of the anon_vma is not being undone. Add the necessary unlink_anon_vma() call to the error paths that are missing them. This issue showed up during inspection of the error path in vma_merge() for an unrelated vma iterator issue. Users may experience increased memory usage, which may be problematic as the failure would likely be caused by a low memory situation. Fixes: d4af56c5c7c6 ("mm: start tracking VMAs with maple tree") Cc: stable@vger.kernel.org Cc: Jann Horn Signed-off-by: Liam R. Howlett --- mm/mmap.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index b5bc4ca9bdc4..2f0ee489db8a 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -587,7 +587,7 @@ static inline void vma_complete(struct vma_prepare *vp, * Returns: 0 on success. */ static inline int dup_anon_vma(struct vm_area_struct *dst, - struct vm_area_struct *src) + struct vm_area_struct *src, struct vm_area_struct **dup) { /* * Easily overlooked: when mprotect shifts the boundary, make sure the @@ -597,6 +597,7 @@ static inline int dup_anon_vma(struct vm_area_struct *dst, if (src->anon_vma && !dst->anon_vma) { vma_assert_write_locked(dst); dst->anon_vma = src->anon_vma; + *dup = dst; return anon_vma_clone(dst, src); } @@ -624,6 +625,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma, unsigned long start, unsigned long end, pgoff_t pgoff, struct vm_area_struct *next) { + struct vm_area_struct *anon_dup = NULL; bool remove_next = false; struct vma_prepare vp; @@ -633,7 +635,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma, remove_next = true; vma_start_write(next); - ret = dup_anon_vma(vma, next); + ret = dup_anon_vma(vma, next, &anon_dup); if (ret) return ret; } @@ -661,6 +663,8 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma, return 0; nomem: + if (anon_dup) + unlink_anon_vmas(anon_dup); return -ENOMEM; } @@ -860,6 +864,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, { struct vm_area_struct *curr, *next, *res; struct vm_area_struct *vma, *adjust, *remove, *remove2; + struct vm_area_struct *anon_dup = NULL; struct vma_prepare vp; pgoff_t vma_pgoff; int err = 0; @@ -927,18 +932,18 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, vma_start_write(next); remove = next; /* case 1 */ vma_end = next->vm_end; - err = dup_anon_vma(prev, next); + err = dup_anon_vma(prev, next, &anon_dup); if (curr) { /* case 6 */ vma_start_write(curr); remove = curr; remove2 = next; if (!next->anon_vma) - err = dup_anon_vma(prev, curr); + err = dup_anon_vma(prev, curr, &anon_dup); } } else if (merge_prev) { /* case 2 */ if (curr) { vma_start_write(curr); - err = dup_anon_vma(prev, curr); + err = dup_anon_vma(prev, curr, &anon_dup); if (end == curr->vm_end) { /* case 7 */ remove = curr; } else { /* case 5 */ @@ -954,7 +959,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, vma_end = addr; adjust = next; adj_start = -(prev->vm_end - addr); - err = dup_anon_vma(next, prev); + err = dup_anon_vma(next, prev, &anon_dup); } else { /* * Note that cases 3 and 8 are the ONLY ones where prev @@ -1018,6 +1023,9 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm, return res; prealloc_fail: + if (anon_dup) + unlink_anon_vmas(anon_dup); + anon_vma_fail: if (merge_prev) vma_next(vmi);