From patchwork Wed Jul 6 00:35:33 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: 12907224 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 E9DEBC433EF for ; Wed, 6 Jul 2022 00:35:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D7F298E0002; Tue, 5 Jul 2022 20:35:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D07E08E0001; Tue, 5 Jul 2022 20:35:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B32DE8E0002; Tue, 5 Jul 2022 20:35:39 -0400 (EDT) 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 9E5B98E0001 for ; Tue, 5 Jul 2022 20:35:39 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6099B34F45 for ; Wed, 6 Jul 2022 00:35:39 +0000 (UTC) X-FDA: 79654806798.19.09F7632 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf23.hostedemail.com (Postfix) with ESMTP id EB5CD140010 for ; Wed, 6 Jul 2022 00:35:38 +0000 (UTC) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 265KwsYC001747; Wed, 6 Jul 2022 00:35:36 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-2021-07-09; bh=fENrfAXjmwrJrGB1l/vpS+dfDOSXV95lX1im9CR734o=; b=Ea7VwumlklvzqieeA5ISxjiu8R1cVADGc1HGIKmoHbaV4wMxEAjdv9btAqjm4usTW3Zm Q1u0mHzF2eRdrSxN/I+EQYGfBXA33Ohl0I8bcmzS5LFQgTl6MkvEU4h/YvOqE5NdwV1W Efs0tHilp5pAewTj9BvWBZHQS4KPhFzLTvjb9x/X8f3YrvGEnZBvuCo6AtcqlZn9W/LC pM9wP38QE4d5mqEiq5/+kS9RIXi2RnWfLTHx81kpl7SKUUmJ4x2RxbocRYYddY7zwN7t C9GoN0uikNRitmeg4ILhZtFnkhWjX9K78zf/KGMSmVzeKoDWv7UTJXNvKQ5MkskhTuxi Aw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3h4uby0haf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 06 Jul 2022 00:35:36 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 2660BbXB032416; Wed, 6 Jul 2022 00:35:36 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3h4ud7my94-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 06 Jul 2022 00:35:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B3dtntN2+/9o3YRLBMRN81CtHzGMZMFfI1NE+oxBueW6JZEHvt9gmopjY2tSgmWzsMMt2m+LM+Oaa5Ad9+/MPc5R8bpN5is8lHWm7dn9H7fsgq4HHfYM1FBdjalo/n7I1vmwbQEPp1Y10eGInyk6+xqdPQf85hGHCjY4G5WimvttfeNpW1UF5MPXQ2XmMWR1psPRPo2y0a+gSLZ5EnfwUskQZGoBQz8tXdRscWg9BlH7yKMa7dkZrMsbvDo3FccgTaq1qjZXarfGlENG0cGjhWokDXC72E4afS+cAD5x9PxjwAimtv+ebFScvnFxlrHHoqX23INXhkvrRyOU1vLUjA== 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=fENrfAXjmwrJrGB1l/vpS+dfDOSXV95lX1im9CR734o=; b=bK17VtPSbov/RBHFabXzINJoquxQGlRNtBMK7FXGdbAhOisdUOGu+8blEvP4MExpLqjcxENxylyK0gkulAa9S/JMlYDKe5rjz910VfhTFb4+fui7pfyh5IUQMeY6P02iSE4zGHV4yzrPU/E4CNqp4EWvSDAuqffeXmFsXnLbj6QE99Ni64P2XgStvvdRK8gddSStYqW8aEgySyaKlgfL7IVgluDueO4jfa6FEARphk7sqrgTZO/DXeWMXvNBGSpHoHoALwVaVdmDfYmp8plAzGJlMWn47+dU1s682pbpXFPyB65064Ls2KZopIooxsukdcGK5OM8ZSo0oD5pivdMdg== 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=fENrfAXjmwrJrGB1l/vpS+dfDOSXV95lX1im9CR734o=; b=iT2u513c5Yw9r/bgWcVy61nBfhjL31JYmw4vgPpgiqAIGJd0D0K3f570aUtq9GfphfgyeAcqR5OXmY2aqSj+iFCEUmnQNjzclr5eLXtm5bC7pSvpT+qUGMvlKkf1QCoFhKbL3LffT4fUOIgQkKciMpfkUkKBHTNfGw05EGNqZrc= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH0PR10MB4421.namprd10.prod.outlook.com (2603:10b6:510:33::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Wed, 6 Jul 2022 00:35:33 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::6cb8:8ff0:385f:1c54]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::6cb8:8ff0:385f:1c54%3]) with mapi id 15.20.5395.022; Wed, 6 Jul 2022 00:35:33 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton CC: Yu Zhao Subject: [PATCH] mm/mmap: Fix copy_vma() new_vma check Thread-Topic: [PATCH] mm/mmap: Fix copy_vma() new_vma check Thread-Index: AQHYkNBN5b9h95VVwE+7V6rX9Clfdg== Date: Wed, 6 Jul 2022 00:35:33 +0000 Message-ID: <20220706003522.1827240-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-office365-filtering-correlation-id: fc8412aa-0486-469c-26f8-08da5ee77032 x-ms-traffictypediagnostic: PH0PR10MB4421:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: oR2FKQk8E0zQ7tI9lETsUqydv2AKNzIaVd5OECJNgvMIDWlF5fcKAt4clMVLzAoG5zgbdl3G/8kJyN2ZpT3KVn78C5fKxjkAopj6C3khbd6uvy0Bq7D1Exscq8mbF9NjsaFX79U3T2jDgxMxoCG7Cofd/BNJRwBEg77JPz6gSZB42TRCRIQV1UdriG5wF0nl8u1p5iqRfPaTOg5DgmqcfyXi0PUfsqqLhih6LwH9lHtobCFuGbaWYlH12kwp/wJ90hB1OmigZCxTMihTxMEOu/Osu3Ek4fQUo0ljzeQ2KK+9H9N1KVs9dMg2rk2EWDEhZQd6NVWekwG3abW7QJcmw6W8BVdlEccjOMHNen+ej1E2w0ylr9kx/bT/oPqad9ui28Vmp8/lKbyvnYQoheU3AGNtnLLrZLt3lNw4Xus1VmeryG673gvONLa3xghPvX+0bo+eSqFNdPE+V6lJzvwSkKTp3SWOx/l4pVBMun7v297RGgW9BuX+LEzTwkIHsMbzxmJk6CcRcvpwP+Naz8zUQjDkzaOlIv8E2YG8s3WKs1qpiIisLu+qAHMvMq+F0/+GfygcfPm9dOJJLDJ2fws5XNT1Yg08yfN/tnaJot5a32a9x60T5yLM39VzAtBu2Gd3DfpeRUdbt4ik3MQWbRc8nJ3uN2feNJnpiZyQrEqFgIbE+y3VYey/JjK1nRfH0g1pdGrn0/NmCnMj8XORbfCKaGsyf5wnjosvM37Q/IBvoq+INGlUOPmPkpJ1bsoImd9oeInvjJGKeBhZzNWIEHeGRnul6oZnmcC1gjNVYQYliOtL6p+9WmCjeY29EWrR1HkG 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:(13230016)(376002)(346002)(136003)(396003)(39860400002)(366004)(122000001)(2616005)(186003)(1076003)(38070700005)(38100700002)(4744005)(83380400001)(8936002)(5660300002)(44832011)(6512007)(36756003)(2906002)(26005)(6486002)(8676002)(41300700001)(66446008)(4326008)(71200400001)(6506007)(66476007)(76116006)(66556008)(86362001)(316002)(64756008)(110136005)(478600001)(66946007)(91956017);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?jokZuDg2zRxlUz2hE7WXOAn?= =?iso-8859-1?q?zDHPass4ESkXAw9hepzMnHlpDCZBOaCDvDt9jQHdqOqTVhF/AM/23eag19Ig?= =?iso-8859-1?q?HlfVuJs+rfU+yjo0pSsnCz7UG4rzKi5QV+GFQnbH83MDKbzlz5l+F7xvP8XF?= =?iso-8859-1?q?2dPmWEJaGvFIqfIZz4ACtdRR/YKpvPi5ofamYg58yNGirC1rCDUQlOAa1pcY?= =?iso-8859-1?q?ztH+asrK8IVpnRFuigTgp1InqeVmsuw5CDAeJ24GqVgjD7b2EhiFjfY1lnxA?= =?iso-8859-1?q?HxeyjckkKmX85xCt9lMHV/vhftULV+bXJAakHB3hcNyZpXtSxsd9kivVxEMw?= =?iso-8859-1?q?+Nw1RynptApPJUOmuooBfb3//jdYaGZWSl3kbiyH+lI6NwofuHwXYnnyih35?= =?iso-8859-1?q?EaNznNBsmCO+thnqMTd+x2lUvlaDk1COGJVNSPeMCGeH0RrGBpDz4F/PPmO5?= =?iso-8859-1?q?IS8r9t+aXDALXN/Eg4fz0szH6uBE6UTMArzh3VNktXGVGFrKMY6ouAdFGlFk?= =?iso-8859-1?q?pEpcYh6VS2yQQF0a4fP6hZ1JU0UDC2TpmuJ7fOnKficw4oyx2X7FgiZMQmwn?= =?iso-8859-1?q?zraEdhwwd9FmgFnN6B0h8oiiiN6QowtKd7z2AglQ4NVrjzOj53QQYK7eV8OU?= =?iso-8859-1?q?K3Jb+4P872dtjOBguIeXkkckpvy4RsYVKzJkGyquo7MShfSKeEptuBZiii/k?= =?iso-8859-1?q?pLdQqVrt37x5KMwS4ziecsGPTUTFmu9JLPVypHxZ7Nza4magGIUkN/qEIOdT?= =?iso-8859-1?q?oJq+maV+ZTd9x3IoRu6WouhA8KoHbk9FMAP2UN8ZcXZFtd420yBAiRH6r2Ce?= =?iso-8859-1?q?tC489WlQSLdvSKJg/63jL9Gl1N8v0AEZwxyW8eyeKsvYxCOsU/Yk72QjykIj?= =?iso-8859-1?q?Vw9LMASrjZFuLHxeALmknT4Tt1Im0xCJTArMGq1nnzxONbIJ+hQPcExD7ypU?= =?iso-8859-1?q?b7AG+v005d46uE5syzA43Nh5RbN81RyKrRhaE4jZPpTpT7iXExfTwCbvUw6m?= =?iso-8859-1?q?yRUVRF+ApJ+o/mTWJVYpcxnePByWY7IMYj80oHanh6/m8ky1RX8EBzhgSANv?= =?iso-8859-1?q?QW9f9M5mwjmEQhg3QmRqwFbx1ODjW0LxtT7xmGVYKBFqB9b0YdyGFG2lS8ph?= =?iso-8859-1?q?ziXY/b+d/oj9+dElf7VsWb/h4Inl/k856kgpnh6iK0pe8JL4XLGZvnIkt/3M?= =?iso-8859-1?q?/6BEX5QF0jdu9IlQ/gm3P61TY0yzskZoyetcg/IxkuadNGPDQSqH45zBtpLD?= =?iso-8859-1?q?QLQKY4j1sTK1N7x3zeW55KQ3EWpunbAJ481jw/nfQ1AmSbXjDNxEOeZadVBA?= =?iso-8859-1?q?PPsotPL1uow1xQTwyHlJ/qChmtbTr46WISdyRrDOgLx+Y3B0MP0LFxH9H96W?= =?iso-8859-1?q?/gJmdaM1fzeNgn3tJkJ8zGJpt3/oV7d9MrfckaKRIhZul6PQwvxyyX7graAw?= =?iso-8859-1?q?3P6gWSgimzx+obvHK2n5OT2Dd4ayIqw694c8lTJzWLbevSUYFWTPDpgyXh1h?= =?iso-8859-1?q?uNJU1PoD1qWPYpTUjIsMd5eKxxqFoxsLdhsou3E2P8w/PlAl7Yp1BzwkBtTC?= =?iso-8859-1?q?dHdY4QgPzhjMfT1a9LoYhgRjIQ/kE+GXYfbpfhDtwYYukmhYP/i6KDKSKVOI?= =?iso-8859-1?q?QiLExLijc3fGe2rAk+KvqZYd/d0z+IMc7/BewlQ=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: fc8412aa-0486-469c-26f8-08da5ee77032 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jul 2022 00:35:33.8981 (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: ILVhqPyEeFYu+vwU6vbJi+M3oUFRXIkC/q/+u1TT1SThdA69IhWMwzVsun/88HV2W12XSYG2mF5UqrYt3t/LsA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4421 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883 definitions=2022-07-05_20:2022-06-28,2022-07-05 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 malwarescore=0 mlxscore=0 spamscore=0 suspectscore=0 adultscore=0 mlxlogscore=979 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207050102 X-Proofpoint-ORIG-GUID: 0Fs9YtK6oCClNoSIrOe5nAJvC6pk_kk1 X-Proofpoint-GUID: 0Fs9YtK6oCClNoSIrOe5nAJvC6pk_kk1 ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1657067739; a=rsa-sha256; cv=pass; b=q6TZWSkZWDmvSZY88QulndW/zgdt9y8HaX730in4vsa4Au+QAYHNPP837Nw3noI6aoQCHD DyJTzO8rkQgLH6Avdw0fWlOittRor4COZqgNzGgefDGAKrgeGunTqB0d79MVZKpI1pN0aQ P9M5LB5JqMxlyYN4MzIK531ajc/RVZQ= ARC-Authentication-Results: i=2; imf23.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=Ea7Vwuml; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=iT2u513c; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf23.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657067739; 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=fENrfAXjmwrJrGB1l/vpS+dfDOSXV95lX1im9CR734o=; b=7mdLiumNCC/YkyZ+pmCEw4UO6xk4LHKbEcqsaK7SuFVuVMPTmNhQFFIXTFaqfy1ziu9+Px 4z4bm8meLGK9/EVlC/vmChWSe8eD8pTbUS92NNtEWVVzgmPdJcwk6TJusErmn+myQT4oS9 agP/bqPaZ8DjFJ587VN2WFC7M0fACHA= X-Rspamd-Server: rspam04 X-Rspam-User: Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=Ea7Vwuml; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=iT2u513c; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf23.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com X-Stat-Signature: mmr79zr9np4gcdh44r39uzb3upesmjcj X-Rspamd-Queue-Id: EB5CD140010 X-HE-Tag: 1657067738-289832 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 checking new_vma limits to ensure they are not within where the copy of the vma will be placed, ensure new_vma is not NULL. Fixes: ded0cf440d9b (mm: remove the vma linked list) Reported-by: Yu Zhao Signed-off-by: Liam R. Howlett --- mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index dacc01b0126a..9eb663cde5c7 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3293,7 +3293,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, } new_vma = find_vma_prev(mm, addr, &prev); - if (new_vma->vm_start < addr + len) + if (new_vma && new_vma->vm_start < addr + len) return NULL; /* should never get here */ new_vma = vma_merge(mm, prev, addr, addr + len, vma->vm_flags,