Message ID | 20250222161952.41957-1-lorenzo.stoakes@oracle.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 0E619C021B2 for <linux-mm@archiver.kernel.org>; Sat, 22 Feb 2025 16:20:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9ABCD6B0082; Sat, 22 Feb 2025 11:20:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 95BCE6B0083; Sat, 22 Feb 2025 11:20:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7AEF56B0085; Sat, 22 Feb 2025 11:20:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 53BE86B0082 for <linux-mm@kvack.org>; Sat, 22 Feb 2025 11:20:15 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C49DA1CACE8 for <linux-mm@kvack.org>; Sat, 22 Feb 2025 16:20:14 +0000 (UTC) X-FDA: 83148092748.17.32745F0 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf11.hostedemail.com (Postfix) with ESMTP id 6BFF34000F for <linux-mm@kvack.org>; Sat, 22 Feb 2025 16:20:11 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=GGw9u6sx; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=FgI+yBOC; spf=pass (imf11.hostedemail.com: domain of lorenzo.stoakes@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=lorenzo.stoakes@oracle.com; dmarc=pass (policy=reject) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740241211; 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=7Gt5eSG22Xb+Arv8Rt+7/DyyZ/M5IjGmN4eQmN1A6pE=; b=tQsUmNq1NfmpFNVaQ31WRPollVWVyUQC0cNPJtqMoYCSP5o+hxFRgfVhNSF8aew0nTU9Zd OpMTUbJQFa8GJB6Pw1Gg7+QAugH70irIrxU+a0db/8S1aAmex3grf7jd9FBzlLTs1EK4xU nGOz/y7QWXjc3K04DVsebRKM7O3A1OU= ARC-Authentication-Results: i=2; imf11.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=GGw9u6sx; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=FgI+yBOC; spf=pass (imf11.hostedemail.com: domain of lorenzo.stoakes@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=lorenzo.stoakes@oracle.com; dmarc=pass (policy=reject) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1740241211; a=rsa-sha256; cv=pass; b=bncZ2Ga19RLLtLz1vH3hq8jKwdcHgw+kbj0Blx6xghbXm7leZzJNmuJGDqk/Cw4EAT4gaP gB/RoQvTU0jXk6A7dDyOHFtR0d4zCPOIcDZX34Vh6oCPJaCsG4I0v7qyZfAs3svYXYFsZ8 r3KayclpSkZy24rVDbaP7VSXPT16b1c= Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51MF01tI012495; Sat, 22 Feb 2025 16:20:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=corp-2023-11-20; bh=7Gt5eSG22Xb+Arv8 Rt+7/DyyZ/M5IjGmN4eQmN1A6pE=; b=GGw9u6sx3uPBJEOwHDW7Ov/ECODUD0Fo WmPYRsQcgYwnkaw5EaWOhtW4+nlw0sttOrzMDW+tO++av60l/YUj4+W1vo+cptn4 vaZMXvtAmSGn5iWnjcO8DQBGpvzvLK4jtzijWzjZtyT4O/UKvCfk/kTzdS2TxSOw 2+mGAr7A0jhV4HCKqpJqHj18VUYb9uckU3b54EMJcegaTRSBa9RYSMw4BdkCof80 PuxEf1MFDy/E2nJUI0PkkDGMlYWXNSJ/zEWk2OKpS/xZ8+7wB3Mv0sOWwKcq6MDh 5EnMz63b0y1NEcn6+Rl4nncu07MZvF3NQSUx7ysIc1FQzR0PNAsN2A== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44y74t0c50-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 22 Feb 2025 16:20:08 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 51MFCxCs008160; Sat, 22 Feb 2025 16:20:07 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2170.outbound.protection.outlook.com [104.47.55.170]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44y51c5tj6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 22 Feb 2025 16:20:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TFSa4Oij58PFqU6aVbBvMqF9lodwOhF7uZiVreFxzWYrzK9V8TmbIXEt3AegFXt/I1DG8OIKq+qbZu0Ph8c3x+vQzD4zEOtwhd5wv+IbeT0ED64p5zKdS/96evwUkUI39SMZ1CqbXnzAKusvAz0Lht8W9kh4kg0/T55Sgwv/BYq37XAgq6Z31jUOuOabdDdjb+sNTrm2OJHDq/gmQJy+EBjtwrtX4uDPxs3qLToVb2FMDya2DaeUXUxzLL/nbRhCB11FQWsv8thaJCBAs+WUpl8Un1UJxRtRlWIE0H9F7EDd1fRNRSZ2EaMgqZo8Yde78ZQt5reHeBQKXtqLUa096A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=7Gt5eSG22Xb+Arv8Rt+7/DyyZ/M5IjGmN4eQmN1A6pE=; b=KWsXlxFsfpvPgfloZMHOZ587CZPs3YIc2zj2QNnnTBsXvcpc43gkGd031k2mqHRWRf6NqP7ueYsNPGp082I14scKPCRvV7qSt/P/F512ROeasy3vf94lZDbIrQqhATtJ/fwbtpMq3tSrgqurpQadtOPuY8cGaBmUusPPGFZ7z/07dby+GtuaQ4lWgeV306eWQe2OT4EmNwCvvFkIktlQEumfbC5eBMJUy72XeyPDP6ioshiTCdN4KOMNlZq/Zylw74+FTXHF33SqRMPwVcN0YmMz/xHIVG6wsVBhQS/OttY6Xqqe1/HukQXaHqd/Ga/dfo+t4ftLZ4E+N18gafHLwQ== 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=7Gt5eSG22Xb+Arv8Rt+7/DyyZ/M5IjGmN4eQmN1A6pE=; b=FgI+yBOCIttcXZgqEQWyvxdwtxZ678CjHqFMdp8zhf76zDGJfj4xhCOj8U1acJmdys453q2FA+4bN1q6K0bIQAzN5GHpMPSlj3YIwqqbCtFNTXZTozK0dFxmajbxF+KEJgpGz3b0f0JOBVGFfd6ymoyqnEtdrXZQuFcwqcTbnj4= Received: from BYAPR10MB3366.namprd10.prod.outlook.com (2603:10b6:a03:14f::25) by BY5PR10MB4275.namprd10.prod.outlook.com (2603:10b6:a03:210::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.17; Sat, 22 Feb 2025 16:20:01 +0000 Received: from BYAPR10MB3366.namprd10.prod.outlook.com ([fe80::baf2:dff1:d471:1c9]) by BYAPR10MB3366.namprd10.prod.outlook.com ([fe80::baf2:dff1:d471:1c9%5]) with mapi id 15.20.8466.015; Sat, 22 Feb 2025 16:20:01 +0000 From: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: "Liam R . Howlett" <Liam.Howlett@oracle.com>, Vlastimil Babka <vbabka@suse.cz>, Jann Horn <jannh@google.com>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Brad Spengler <brad.spengler@opensrcsec.com> Subject: [PATCH] mm: abort vma_modify() on merge out of memory failure Date: Sat, 22 Feb 2025 16:19:52 +0000 Message-ID: <20250222161952.41957-1-lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.48.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO4P123CA0315.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:197::14) To BYAPR10MB3366.namprd10.prod.outlook.com (2603:10b6:a03:14f::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR10MB3366:EE_|BY5PR10MB4275:EE_ X-MS-Office365-Filtering-Correlation-Id: 055d44b3-ed27-49c3-4193-08dd535cc1c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: Vxy3lXs3z5y3k0hYJWirOxGed0/0/lHoYiJOGarhNBBtGEjy8UuPOnGJjbAokZ2V8qME0CfuY3yo4YhkYPIp90fK95vnVIUiLunUBuM6+il08VZr5ObkQhs1QtdLVdLr1khzaxXr/KCvuoz41yyJUhMpKoUy0E1xfNDn24jP0ag3Vs/ISt1i/TjeqHMPSVTKO5Ixdu+tsOUm7G2/0Em6cUy+/z+OKZDI2tZOyxzY0vIpIQYG7hLST/bEuDwa668//IqkjHl7Z9NxpM8jtMBFsq9f46hHA9qNEyZHx8Gaq+lfWTJ2O1VBsiFU7KjVajGxp94/wo/4kZmbvsg9deiTskNgj4n1CM8HbtNbJH3Fr2R6PrNrPMrsARBHX8uc3NW+jdCx4sSiVqqhjW9Syk+hUqdSgqWm/Asv9lQut+aowIETI2pgbQla/Yn804AbfnKezYgWNsgdzB548oamGYTBfuZIExciSBpuEZi89UbnCUNFQydgeVaGMfW+TEozEZIcpJy6U5lUbQafzrC9cjIqN3mbIh9F5HCPD3bTHo652SqqV5O32iOJBCHxJiooFX7EsvabUSs30cXssEMOk6w+jFs3g1cjNKeuAxPA6s5tiAHP7t0Nn/k/is/cDsvnP+zJuaUSw6heCIVOoTD/LqJGA+xAJCuzaytoYVXLxgeHauGKJ+6UW5woiOPVBge9302usdDMZV8hjkQXwn1vOJIW1ANEFLKMF12TZf1aLfJbeQ1MJTk2+Mp7MQgRFMxO1yUs9UwUqzjSiu8wHu6Rs8NEil77HOpXi47/zpO2S4gY/RrAYE3rV+Mc9WFEz6CaUaK3oeSdOthQljYZN7QMNGcBtuml7JaOoRTG1yRKhUafTL+nUsIQQB6U+cIDrmoAN49BdZzyMgehAxWYGuUnqsh9xpBGEqP+tkCQsIWM1F3iRtqVWWxPPCb3kEWTK14O6XUaEBxkz2KsiKZFDkzGSje8jPpToyFXdJz2MTL5PY9mfXsko14pA+7LoLm7Mqr80bVGaqXnlPUL+DsPDEx9e1QiimD0XOwARXIBZ8cxJanKBW3yqiE0qhCvDy+WN8FUpzYCF9X+NH2LoeBjqz9z2Xmmq+QJoZ39meBej/ZasmcXt1t25vj9WpcotlPQmn6AkZ2qGjoqfSmLbBt7sQlIkhBNa1KJZ2xmRXI+GQaPj9O0r3D8Su0jDaYZ2e16wajttu8oFwsB/zuHZtuGtsU6EGjLP5YAodINLlrhFZdMQJrtp7bPIZna6vg1eOrGaEy1GK0sqyQUJxtRfsriuy2CRPEL7gH+jmk2yE0NxVoDlfjpVRBMPC++jedI7jFX4xvlbmulyd4OYEUuoqEkpwWSW/O45P+F+a1U47tyI5GbvnqAaPLnJD+zxusRL/cRBDoRv+17 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB3366.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: puvMpe7tWyxVqXu9jmbrqK/qSKAOef+9B2tlCqLike1QJ0pNJyJJ5xhae4VcoAKAigrEON7JWqBh3jbSWNscCTHBPlWlFMV58T5M9RpmmePAkcgzl+5KObPDPVUczeCMgc8sljnKHNLuM0JMDnuu61QH/bX3K47w82okYid0ztrBJsg69f/05eI2LBePFaCYplFXoaAGZV4xA3MThuzgEIwvQTbV7Qzs7misN1uiuebQk6mb9xpyxq6h2QIs89ta/jEus+wE/Wd23Ooaq2h7rQynMsVzi+2ztUuGvzqjvvJKBH9blO7GPicUV8NEreQvmUK7V6uVLSwlpQOEqTVfSKUZqqk/Ow6LOudMnNkf9R8cUo8NMPa99tYWB3OonRNbJndomXEPpxA6U1/TrDpnCUb70FLom9Dk01Q28sebEMmkF72jnVx/ISDXQuWNp+W/aKtZavqIOhaC0EStwS208+k/Hje3/1XmfY5yGpFb0iee3wJPp0GzSNvrgncRS+B/3BXwY5QNYyjyZWnq9Y1wkcOcSYpAMjYVB5aK1C5V4afB7dwXVQb3g0WUaqbWsZWGK4vpHRldaraq+DMOW+mp/1TTF1wmUHuJ5sF2V11Zwu0KRCxfAX4eIaDEoYJSHGOHFFJ1M+f2N8kzZEvVBYTvEsef0rSufljqnfxjFHUPzjgAUdV+6ow/54Ql++QtaZYRRjIc5d9qgazSu5qtXhH2SX5Ne5mY+hCKPXyHICNnGQAihDobukJpxxA54e6s1wnSBKTNYk/nfW6Onk+xKbDcuxZucXOBoBLZwuOANWV37lxhx7FPVG0gZ1YCTq8cKlx7jk5mpUOepZ2ab3iQTCiKZKNJZl4Fwf9YK+qVX8+8QbtE08kavvM66smB04K3q1wUhc5OalxlppEoKSPb/8/IjbiNOmmIFJ7PT7dXpgITvfoG8odYxXU6VNM1HBsamXlmQA7YSQDkRSmLBB1bG3zlMvfwkIQ9z578Z90xzucE8QF+cvWWJZpAMbRuri/HqDJ0agC1F4MX4KGGy8SAB/ZqGd9R+ipZHFLF9C8zPn4tO3cgkBTvMKNNCoe1Qi6EIKuuJRDw0c2ffB9uJTPLqn3a29vc1dG/hOmtRW7wlcMBYocLF+v8PT2BF5MkRjZCjQdk2DauLv8vFczwuCRmiBgwfIaPkIVhkR/w/G479qW6BFdsekLUz/c8Fw5jEpXCcEtt7adytnHt5dtouyR8h0uujBNQgcAPjwQwj/vEY897s4PHIE7Fdw6EXavscJp+4fQ2Pl/Ala+Jwmlbf76jukYlMhjW4LGKidrqLi8C5FoWkB4LJs5e/quPzmeTho+10jczwl89YoKwTAcacwxkiqCE+UuXkA45fF45CENZTLUJm5NnAlPZYAj5O5MuCJ8vIugx7OYE9LJ02T5o+sIWbl1phVFZEYxFIzkDoDpDYbCM3HKZZ7t1QEYvyuiNvk9/HBKykK3/jAq8ZBFHiaKghshzX/Kyvmp6qMVaZM24mn378eLYXshIHvCS7tQ+gMCH/BQG1qOXrB0rhFUk0VNIp3ITJakC729PRPPhdCkQBEskmpQMIxtuDpKuXkaEVJqSD7CLgP35nzrsjjH1tHUiZAayJQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 9aff0LRsb5FYM1+DGEKpFkV3wrLzouPPv4CScybrljYn//CtCjb8/nzhTw+tTK2pnheO/S3rPYdtBFPB/D4duKkibdfvASLj+4hpBHGSzAhPTFLqOmj56Udxv77okp5jQvOTDJPipfgmbRWNoGk8chHyhMEqigyPbwrk0qKYOGIe3IjzdryXU97WqqyIA32WckrFY9Zp7SKABi+fZFEISz5yhgOkLVRJnOdMOs4TLf/lA8b2IdMjUlFvjldGKXawVtUIGWMiFuFvdTFj026yiGiDPrsPYkoj6e5+5xzTGLYAtCUPL36uz0wxo4wRTJ7YMqtEQb/Zn0/nRN2uAiRh0h9eHYp0H1/eXUcsnRegcbuModmvBAml8o4UX/4t62KOuAOBWEuU7vY7ehn+rlu57SFChtZwohrJC0QC6GHjahrWusEj79vUtsLF2O8EnFnDmxLRIPWRSXEJQz/O3Cznyi5qxrDUtOx6Az1mfIx2iai5k21u1xI/0AvWI9gn8By7JMH2BwDc8tVAW+g7Bhf02xU7g7zL45lz1d//2fKJPL9SUuvcFbOoHF4/hgx7ZSilDbcAlyHAdu0PzSAe0gViXccOf/tF8adXCFyk8nvCg58= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 055d44b3-ed27-49c3-4193-08dd535cc1c3 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB3366.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2025 16:20:01.1070 (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: hOWaLhoTSa5cyGmljfyjCRstm/QuVDhqaToxd44EwUFpLO8T6pRTZvBawcEO9KvbZ76KovsQD9Pi+KNtCO9SDNStix8AMHts6/7/IMoJ5/8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4275 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-22_07,2025-02-20_02,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 bulkscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2502220130 X-Proofpoint-GUID: XVWnFJCT3fzkr89H4MF3Mrv-ZQlYtDHN X-Proofpoint-ORIG-GUID: XVWnFJCT3fzkr89H4MF3Mrv-ZQlYtDHN X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 6BFF34000F X-Stat-Signature: xcirwfi1uru8kefp8rmrz9cy6xpziyy5 X-HE-Tag: 1740241211-116802 X-HE-Meta: U2FsdGVkX1+F1cIHdQQyMrXLeyi6jatp7gHvsJzMlXM/0220NWw7R1e2EmsBaeCWfaVz6jHOtmFbzbgaXRinDxRJ4grUjUuNsClgAXNFmzJ0SlPc4TY/GIOOEMNps38i/ZYcYWveiwQ6iIoyDpfpq/Lpe6ItuCebJMm5Ph/zgpjP7mvA0ePXtT2DWfJVApHTz5rr0zBxDdUAqu8r5rQ7sG0nq5Z4IlgHJsPkvOwke8Fz+jHBnyxBCqlzzMKoEeLcmc2/41p0EdBw2rgNvT4vlmqlzlJQKtogO8TfF3Z4CN13Eo3GWD3o1DRfjIUHbRU7YMkS0Brze7Ct8q7wDukbGeu9hHPoE1/bG/UTAUDss5Yv3jhg1sEHNmVXksadDfnv33QLBnVAahM4y+59+o4+YuPicabRz9Hmy8uFCQjPEUZl/YQmzW4a+VnwtDBmGaoq9tmPF1fEQxvStdxHVMqQCmdBwPcQFVhW580JcZSKRL2pWYFUDJGeP86swQnvahr7uqhwppsQC133KePvjS74gyGyPgZ+XqkE8699CUfP98VzUdd+A3zoGOy4Fk99XFKulBAXZCwcpSv5/GTGQgxHK9deQX2qivRNJZj/3Yos1Hn21UEb8paClElMMkZKSUEq1k924AcQfL9X3DEMq0UJ6xu7Rd7TtMmXjEubwuLoLQwA98x0eZMt5LGYIHIdprKl4sB14wFK40j2MGM9Filuno/khqnTo6d6JEF57b7QUw67juLeiJu1KoMfBse6J9VODiMqGI8lqpphk+ZfwPctQJ2HayWm1Mz22E0XUp0WM3UaqT/YQFqi+ExIeAdPLpRL1ml4zK2S8YbMTeRkypGxQjSE9UWJ+CxVaEVs03Zz6fuAh1+Ess68JE+McGhWDXWzvZzoHV4YWpO3/d554OpkreBcic3ujck49kVSuX6FOt524rk0HzNFmYQV5wAxFh7K8eP50BKIA8Cu52j6fBe NPW0yWG8 PZY+QK4uAB7mWKn2Ku5av51tKYbfwdJh5GeEMkfyBVQxCqk2yfwy72uMRlsDe127la884Z81oPBdr++7CaT2SAUmDPx+Xi/2to9gDS204iXYdE2KotKehxkRsFbTDGnIeso8JDZ2EDh5gU2H5wBaOamxbjlsM4eCv7sImf9BBsCEeHSy/K/oYcQY3GQMn/13NoUlzqlt+TDfcEJ4KFevvvJUj48ixCYV47bvxDYEhyjIee+BH5FTLL3Z3An9uqJ3Dk3aXV3Az0FLyo/TluauB0sQjAH/vRlzXAFdyTDzgfwxag1DnwqUMT0QfF9leGlgUKI58ers11fFwWwa80K5fCtdWIfImv4WwtLr6mV6kSiZ9q5DpbReqTJnoJ/rS0uBdya5Vi4ktixMJWxC32lcmqvMVuInNj7+aMhSv2u6Q2AIVNbv8IguOMOinZx1VfiPr1JViT79cchKYQ5+/AT0zmHDfHcG36iEeRtef/LikSSGzdY9FvJgZkBvS4gsL4CVpGUS/++gqeg8vGldzFGdlxnYtRPbZxjwNeskbSvS9yybzajm2y8jC0WIslOhirdJGYx3/9PVuMR5Y7fp98Aa+KFb9ZmiQ1SvtEgRCxXc9w8o+SclCg75Y9NGEVPUAcDj5by0jUxTLQq7s6lke8MRBzpKp68x/dNuR4G3rBkbOCzzE9dglwBpHnOEArhPTrA6UTC0V8pWtg27alg2n857tT4eUVGMU8fCTJGYT/rnqrtjcg90OZsHr1iaf2/MmlGktME89S+noBlZyl2mfiPDkCwtkeA== 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: <linux-mm.kvack.org> List-Subscribe: <mailto:majordomo@kvack.org> List-Unsubscribe: <mailto:majordomo@kvack.org> |
Series |
mm: abort vma_modify() on merge out of memory failure
|
expand
|
diff --git a/mm/vma.c b/mm/vma.c index c7abef5177cc..76bec07e30b7 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -1523,24 +1523,28 @@ int do_vmi_munmap(struct vma_iterator *vmi, struct mm_struct *mm, static struct vm_area_struct *vma_modify(struct vma_merge_struct *vmg) { struct vm_area_struct *vma = vmg->middle; + unsigned long start = vmg->start; + unsigned long end = vmg->end; struct vm_area_struct *merged; /* First, try to merge. */ merged = vma_merge_existing_range(vmg); if (merged) return merged; + if (vmg_nomem(vmg)) + return ERR_PTR(-ENOMEM); /* Split any preceding portion of the VMA. */ - if (vma->vm_start < vmg->start) { - int err = split_vma(vmg->vmi, vma, vmg->start, 1); + if (vma->vm_start < start) { + int err = split_vma(vmg->vmi, vma, start, 1); if (err) return ERR_PTR(err); } /* Split any trailing portion of the VMA. */ - if (vma->vm_end > vmg->end) { - int err = split_vma(vmg->vmi, vma, vmg->end, 0); + if (vma->vm_end > end) { + int err = split_vma(vmg->vmi, vma, end, 0); if (err) return ERR_PTR(err);