From mboxrd@z Thu Jan 1 00:00:00 1970 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 28BFFD68BCD for ; Fri, 15 Nov 2024 19:06:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A95FC6B0085; Fri, 15 Nov 2024 14:06:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A46346B009F; Fri, 15 Nov 2024 14:06:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 871866B00AC; Fri, 15 Nov 2024 14:06:11 -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 6396E6B0085 for ; Fri, 15 Nov 2024 14:06:11 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id EE600A1C7F for ; Fri, 15 Nov 2024 19:06:10 +0000 (UTC) X-FDA: 82789257642.19.74C1327 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf11.hostedemail.com (Postfix) with ESMTP id A09FF40007 for ; Fri, 15 Nov 2024 19:05:11 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=Yp7mpSM8; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=RVTxIvJI; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=QPePSUhw; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=3o7xi6s1; spf=pass (imf11.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731697330; 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=eXpQ5/Bhx3ZBQhUJC7flTpCe8EKcfTBc1bkMrTXMsiI=; b=duRKOPWjkvGCWEPtXNxgBsPyJtZSjTJdpdMA2+OAy+i17LPvQutlbVcmtHcSq3vUfQ27CI g7PBAMdmcGF8zB7vjJua75lvlNcvVLbeNFezS5fk221hzksPp4QuyNIbvaCWZABM07Ee9B MK+mLyXhYFCBwRn6jAbrexxEfFNssfE= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=Yp7mpSM8; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=RVTxIvJI; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=QPePSUhw; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=3o7xi6s1; spf=pass (imf11.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731697330; a=rsa-sha256; cv=none; b=j4j6yjp+M0Gqir0Juck7fkBKB3itc7X2kCBm1gO83bb0W7sXf0blfLE+ryECQKvPyp/J1x JK6ZICTj8H6IyoU1fid5GeLSHjyGUFPWXLGv4PbzOv/UvD9/o+GTBcX71qGvDA+wXq8ekQ Gt1oH9TF/TrdbohRid5I7MDQ/yDnANM= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 952B62117B; Fri, 15 Nov 2024 19:06:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1731697566; h=from:from:reply-to: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:autocrypt:autocrypt; bh=eXpQ5/Bhx3ZBQhUJC7flTpCe8EKcfTBc1bkMrTXMsiI=; b=Yp7mpSM8MpNEzPJ/7Fu7US7olN+xjRA3arpa73cmRCONBXqt3CSJ4mybCfVV3bl3Q9d2g3 y5vOf9u/JJlKhYjTL0WRhHR3BAwRUJeF3iN0zNqAzscoI6gn2jkUdE97/3BJj0l6Ub+CN6 GUNEQPHBYdONQoHkGr6I11AAx9DHLmw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1731697566; h=from:from:reply-to: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:autocrypt:autocrypt; bh=eXpQ5/Bhx3ZBQhUJC7flTpCe8EKcfTBc1bkMrTXMsiI=; b=RVTxIvJI1Cx1Fj0KTDBX2r2hv4Q/INIkhQzLIOSwWg6TXl2bf2F00kExAih746/dlHAUsq 6u5f3BKtardblPDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1731697565; h=from:from:reply-to: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:autocrypt:autocrypt; bh=eXpQ5/Bhx3ZBQhUJC7flTpCe8EKcfTBc1bkMrTXMsiI=; b=QPePSUhwEc7J92kTIQGRKu9J7sO6ZTZjAccUinTqN+RGegveG2Pb44S/SKpjOIXFevk0fd ccXwnbLc6ztE7hQEdLVRxXZdt2HlXdmSYfAYYOW0Qosg7X2YH7iw6KvpApmDITkSDWVsE5 YuD25CwH28+/XLv5P7VLgpqhPmACNMc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1731697565; h=from:from:reply-to: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:autocrypt:autocrypt; bh=eXpQ5/Bhx3ZBQhUJC7flTpCe8EKcfTBc1bkMrTXMsiI=; b=3o7xi6s1DjW/DJAROCrJonuuJLvJfC/WMcViAhqk37QiYtmVsqMqw8S42rGT9vndXAwyFO t+8+/FUFIOi53WDQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 7155D134B8; Fri, 15 Nov 2024 19:06:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 1JRNG52bN2fSewAAD6G6ig (envelope-from ); Fri, 15 Nov 2024 19:06:05 +0000 Message-ID: <2979df31-ce8c-4382-ab01-7e66f852099d@suse.cz> Date: Fri, 15 Nov 2024 20:06:05 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 6.1.y 4/4] mm: resolve faulty mmap_region() error path behaviour Content-Language: en-US To: Lorenzo Stoakes , stable@vger.kernel.org Cc: Andrew Morton , "Liam R . Howlett" , Jann Horn , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Linus Torvalds , Peter Xu , Catalin Marinas , Will Deacon , Mark Brown , "David S . Miller" , Andreas Larsson , "James E . J . Bottomley" , Helge Deller References: <4cb9b846f0c4efcc4a2b21453eea4e4d0136efc8.1731671441.git.lorenzo.stoakes@oracle.com> From: Vlastimil Babka Autocrypt: addr=vbabka@suse.cz; keydata= xsFNBFZdmxYBEADsw/SiUSjB0dM+vSh95UkgcHjzEVBlby/Fg+g42O7LAEkCYXi/vvq31JTB KxRWDHX0R2tgpFDXHnzZcQywawu8eSq0LxzxFNYMvtB7sV1pxYwej2qx9B75qW2plBs+7+YB 87tMFA+u+L4Z5xAzIimfLD5EKC56kJ1CsXlM8S/LHcmdD9Ctkn3trYDNnat0eoAcfPIP2OZ+ 9oe9IF/R28zmh0ifLXyJQQz5ofdj4bPf8ecEW0rhcqHfTD8k4yK0xxt3xW+6Exqp9n9bydiy tcSAw/TahjW6yrA+6JhSBv1v2tIm+itQc073zjSX8OFL51qQVzRFr7H2UQG33lw2QrvHRXqD Ot7ViKam7v0Ho9wEWiQOOZlHItOOXFphWb2yq3nzrKe45oWoSgkxKb97MVsQ+q2SYjJRBBH4 8qKhphADYxkIP6yut/eaj9ImvRUZZRi0DTc8xfnvHGTjKbJzC2xpFcY0DQbZzuwsIZ8OPJCc LM4S7mT25NE5kUTG/TKQCk922vRdGVMoLA7dIQrgXnRXtyT61sg8PG4wcfOnuWf8577aXP1x 6mzw3/jh3F+oSBHb/GcLC7mvWreJifUL2gEdssGfXhGWBo6zLS3qhgtwjay0Jl+kza1lo+Cv BB2T79D4WGdDuVa4eOrQ02TxqGN7G0Biz5ZLRSFzQSQwLn8fbwARAQABzSBWbGFzdGltaWwg QmFia2EgPHZiYWJrYUBzdXNlLmN6PsLBlAQTAQoAPgIbAwULCQgHAwUVCgkICwUWAgMBAAIe AQIXgBYhBKlA1DSZLC6OmRA9UCJPp+fMgqZkBQJkBREIBQkRadznAAoJECJPp+fMgqZkNxIQ ALZRqwdUGzqL2aeSavbum/VF/+td+nZfuH0xeWiO2w8mG0+nPd5j9ujYeHcUP1edE7uQrjOC Gs9sm8+W1xYnbClMJTsXiAV88D2btFUdU1mCXURAL9wWZ8Jsmz5ZH2V6AUszvNezsS/VIT87 AmTtj31TLDGwdxaZTSYLwAOOOtyqafOEq+gJB30RxTRE3h3G1zpO7OM9K6ysLdAlwAGYWgJJ V4JqGsQ/lyEtxxFpUCjb5Pztp7cQxhlkil0oBYHkudiG8j1U3DG8iC6rnB4yJaLphKx57NuQ PIY0Bccg+r9gIQ4XeSK2PQhdXdy3UWBr913ZQ9AI2usid3s5vabo4iBvpJNFLgUmxFnr73SJ KsRh/2OBsg1XXF/wRQGBO9vRuJUAbnaIVcmGOUogdBVS9Sun/Sy4GNA++KtFZK95U7J417/J Hub2xV6Ehc7UGW6fIvIQmzJ3zaTEfuriU1P8ayfddrAgZb25JnOW7L1zdYL8rXiezOyYZ8Fm ZyXjzWdO0RpxcUEp6GsJr11Bc4F3aae9OZtwtLL/jxc7y6pUugB00PodgnQ6CMcfR/HjXlae h2VS3zl9+tQWHu6s1R58t5BuMS2FNA58wU/IazImc/ZQA+slDBfhRDGYlExjg19UXWe/gMcl De3P1kxYPgZdGE2eZpRLIbt+rYnqQKy8UxlszsBNBFsZNTUBCACfQfpSsWJZyi+SHoRdVyX5 J6rI7okc4+b571a7RXD5UhS9dlVRVVAtrU9ANSLqPTQKGVxHrqD39XSw8hxK61pw8p90pg4G /N3iuWEvyt+t0SxDDkClnGsDyRhlUyEWYFEoBrrCizbmahOUwqkJbNMfzj5Y7n7OIJOxNRkB IBOjPdF26dMP69BwePQao1M8Acrrex9sAHYjQGyVmReRjVEtv9iG4DoTsnIR3amKVk6si4Ea X/mrapJqSCcBUVYUFH8M7bsm4CSxier5ofy8jTEa/CfvkqpKThTMCQPNZKY7hke5qEq1CBk2 wxhX48ZrJEFf1v3NuV3OimgsF2odzieNABEBAAHCwXwEGAEKACYCGwwWIQSpQNQ0mSwujpkQ PVAiT6fnzIKmZAUCZAUSmwUJDK5EZgAKCRAiT6fnzIKmZOJGEACOKABgo9wJXsbWhGWYO7mD 8R8mUyJHqbvaz+yTLnvRwfe/VwafFfDMx5GYVYzMY9TWpA8psFTKTUIIQmx2scYsRBUwm5VI EurRWKqENcDRjyo+ol59j0FViYysjQQeobXBDDE31t5SBg++veI6tXfpco/UiKEsDswL1WAr tEAZaruo7254TyH+gydURl2wJuzo/aZ7Y7PpqaODbYv727Dvm5eX64HCyyAH0s6sOCyGF5/p eIhrOn24oBf67KtdAN3H9JoFNUVTYJc1VJU3R1JtVdgwEdr+NEciEfYl0O19VpLE/PZxP4wX PWnhf5WjdoNI1Xec+RcJ5p/pSel0jnvBX8L2cmniYnmI883NhtGZsEWj++wyKiS4NranDFlA HdDM3b4lUth1pTtABKQ1YuTvehj7EfoWD3bv9kuGZGPrAeFNiHPdOT7DaXKeHpW9homgtBxj 8aX/UkSvEGJKUEbFL9cVa5tzyialGkSiZJNkWgeHe+jEcfRT6pJZOJidSCdzvJpbdJmm+eED w9XOLH1IIWh7RURU7G1iOfEfmImFeC3cbbS73LQEFGe1urxvIH5K/7vX+FkNcr9ujwWuPE9b 1C2o4i/yZPLXIVy387EjA6GZMqvQUFuSTs/GeBcv0NjIQi8867H3uLjz+mQy63fAitsDwLmR EP+ylKVEKb0Q2A== In-Reply-To: <4cb9b846f0c4efcc4a2b21453eea4e4d0136efc8.1731671441.git.lorenzo.stoakes@oracle.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A09FF40007 X-Stat-Signature: 89ncwi4zowb1jhxuf6eexfiooyq844tc X-Rspam-User: X-HE-Tag: 1731697511-915824 X-HE-Meta: U2FsdGVkX1+tlrOBsqtgJ+4v1MhrAYq+U3p42HeMVBnBFuEHRqPxU3hn08FukypZDMHfAFVXMiKCTtgmgKV7IJvnDZnmm/QNM0IU0wU1nxXyQX9NG44g0YajV0voTNBHWwWyWkRrTQAwheBtedEsVsu7YHsi7zHEGt1OHgZLOJ5SveTtQstXUAwsXrj3qlgRkZaWCmABpA4gkBxYMJUtq/VM91HMFsZ0VB9qfCSe+lIT2Cjj0gIcLvx+VR3hb295+TE7s7ouziXByFZikBSlNAxpqG+rAJuhHMVLSEMqm1tF2vQFf/k/NoiDY4cPG7rhR3ldt8RtRZQditXItNDxLZvguNfzQdxNn0kex3pwLzbdDDUReC7Vxucqkl9qdjNdqc/S84HTOcjygd154+UdAaqf82kZLiUto3prXXZ9OiQ5nHyQcsA4cyNglv4+f3Jk5OudVEivHMu9e4DrEGYsYjnzaiqYjtHjEGOp3Xh3EsGleIn2PrCsd+bAP7cxDstZW0gIcwPhm508p79K0sP03NqrQbCalq5LTyOMjyvDETvmeQHn0IhfqZbLKOI8bzFYoDFWtuXYcdmJo/K2yz+Z9fkSpGRNbbQCws9x/f7wEbRWzBKORUA0RDzAomRrgV/ZweH96y1/HpMPjg/qST3MT6Bjnxittz4fuazmWkSWCc4tQerMNCaGzBaAzjAxn6I7L79AZ4oMl09IR9C4p0CQp7ju34hLG014MvPEfLCt/EiBXq91vureyMdhKlVAbHz3A/nB4XPd0Jj/m+frO5JBqhjnLSKDu4kqM4qIBpQYUtkxcVi11lzKSVQ4OcsvW/yyA/luFsJ251p/MlT79jpIhfhg9B9UVSrI36Jgqvo0puARZLFZN1bNUP8IfmSDF2RiMJHroUkf1fdVbpC+TgQOZqueV3nAGdNrG5dcdvRQhZhOxitGp60dWDFE+AUig8I9IVxD92JFIVzPudKhMPL f/ETkWbA KMs+vO8tax1KGVsCWUBYSVbU3FYPeuL7BQA3LNdljP4vSpE6+kK6RpCFDLnjYDC992Ol9TBFEAiPUjrC76HWcEiHbeI5lVxmwn9HW/nIi+RXLAlMrEnN0dp9Nm5zcSE8vwXD9dQ67XxhM6tQenGNu+LSrVzCdwcyCj1UIl1ba+mBDzONRkT/s1aGdq/HZpgs16Ki3MZImO8aN1h9TBJc7uiAAz+bLQVEN+VNil0DU+cM1a8Ef5mUHW+B4OlDU0vqfmcQ80A8LWLj7eFnYlBJXCrO7qXJXBK92Ndc509h66JOwl4WeSEdfPHg02EDQYKWVg52ht0zJ6xL+zmV1V9lN5beceK1pr5qqq+EAI1I2FK+jx3a44ezPs0hfBtq9hKotWqbMFJO+sh31JmU0S58q/Pqr7JyvEgLeqZVHlsylj6wk9bgOCI5kjYiHnrTAL3Qthzy09O+FzdCJr85WwTtbCeZgDkEYNHFt57eVNsV0e32Y70m88/30xI6XVIjXccavWQANcxsc+kkRTwLlstLmmuw45IIXlVEcA0jBFxLywlbMRqdYFWkL1fU3/0Fl6VrMNnYugzGM5k5vK148Blcp8lNMG1SbTAIcberbFgFfNf5z481mVAv51FCyQbiK+Am/OqInOrWw0L6qxcgM9d+fg1lkVFbCJ+HIgV0LB21XMy2qlwr9xEW3LhlHiogw0cbgbdqO4TIiCouBT5ljP42uloO41z/kTxML9ZX2 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: List-Subscribe: List-Unsubscribe: On 11/15/24 13:40, Lorenzo Stoakes wrote: > [ Upstream commit 5de195060b2e251a835f622759550e6202167641 ] > > The mmap_region() function is somewhat terrifying, with spaghetti-like > control flow and numerous means by which issues can arise and incomplete > state, memory leaks and other unpleasantness can occur. > > A large amount of the complexity arises from trying to handle errors late > in the process of mapping a VMA, which forms the basis of recently > observed issues with resource leaks and observable inconsistent state. > > Taking advantage of previous patches in this series we move a number of > checks earlier in the code, simplifying things by moving the core of the > logic into a static internal function __mmap_region(). > > Doing this allows us to perform a number of checks up front before we do > any real work, and allows us to unwind the writable unmap check > unconditionally as required and to perform a CONFIG_DEBUG_VM_MAPLE_TREE > validation unconditionally also. > > We move a number of things here: > > 1. We preallocate memory for the iterator before we call the file-backed > memory hook, allowing us to exit early and avoid having to perform > complicated and error-prone close/free logic. We carefully free > iterator state on both success and error paths. > > 2. The enclosing mmap_region() function handles the mapping_map_writable() > logic early. Previously the logic had the mapping_map_writable() at the > point of mapping a newly allocated file-backed VMA, and a matching > mapping_unmap_writable() on success and error paths. > > We now do this unconditionally if this is a file-backed, shared writable > mapping. If a driver changes the flags to eliminate VM_MAYWRITE, however > doing so does not invalidate the seal check we just performed, and we in > any case always decrement the counter in the wrapper. > > We perform a debug assert to ensure a driver does not attempt to do the > opposite. > > 3. We also move arch_validate_flags() up into the mmap_region() > function. This is only relevant on arm64 and sparc64, and the check is > only meaningful for SPARC with ADI enabled. We explicitly add a warning > for this arch if a driver invalidates this check, though the code ought > eventually to be fixed to eliminate the need for this. > > With all of these measures in place, we no longer need to explicitly close > the VMA on error paths, as we place all checks which might fail prior to a > call to any driver mmap hook. > > This eliminates an entire class of errors, makes the code easier to reason > about and more robust. > > Link: https://lkml.kernel.org/r/6e0becb36d2f5472053ac5d544c0edfe9b899e25.1730224667.git.lorenzo.stoakes@oracle.com > Fixes: deb0f6562884 ("mm/mmap: undo ->mmap() when arch_validate_flags() fails") > Signed-off-by: Lorenzo Stoakes > Reported-by: Jann Horn > Reviewed-by: Liam R. Howlett > Reviewed-by: Vlastimil Babka > Tested-by: Mark Brown > Cc: Andreas Larsson > Cc: Catalin Marinas > Cc: David S. Miller > Cc: Helge Deller > Cc: James E.J. Bottomley > Cc: Linus Torvalds > Cc: Peter Xu > Cc: Will Deacon > Cc: > Signed-off-by: Andrew Morton > Signed-off-by: Lorenzo Stoakes > --- > mm/mmap.c | 103 +++++++++++++++++++++++++++++------------------------- > 1 file changed, 56 insertions(+), 47 deletions(-) > > diff --git a/mm/mmap.c b/mm/mmap.c > index 322677f61d30..e457169c5cce 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -2652,7 +2652,7 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len, > return do_mas_munmap(&mas, mm, start, len, uf, false); > } > > -unsigned long mmap_region(struct file *file, unsigned long addr, > +static unsigned long __mmap_region(struct file *file, unsigned long addr, > unsigned long len, vm_flags_t vm_flags, unsigned long pgoff, > struct list_head *uf) > { > @@ -2750,26 +2750,28 @@ unsigned long mmap_region(struct file *file, unsigned long addr, > vma->vm_page_prot = vm_get_page_prot(vm_flags); > vma->vm_pgoff = pgoff; > > - if (file) { > - if (vm_flags & VM_SHARED) { > - error = mapping_map_writable(file->f_mapping); > - if (error) > - goto free_vma; > - } > + if (mas_preallocate(&mas, vma, GFP_KERNEL)) { > + error = -ENOMEM; > + goto free_vma; > + } > > + if (file) { > vma->vm_file = get_file(file); > error = mmap_file(file, vma); > if (error) > - goto unmap_and_free_vma; > + goto unmap_and_free_file_vma; > + > + /* Drivers cannot alter the address of the VMA. */ > + WARN_ON_ONCE(addr != vma->vm_start); > > /* > - * Expansion is handled above, merging is handled below. > - * Drivers should not alter the address of the VMA. > + * Drivers should not permit writability when previously it was > + * disallowed. > */ > - if (WARN_ON((addr != vma->vm_start))) { > - error = -EINVAL; > - goto close_and_free_vma; > - } > + VM_WARN_ON_ONCE(vm_flags != vma->vm_flags && > + !(vm_flags & VM_MAYWRITE) && > + (vma->vm_flags & VM_MAYWRITE)); > + > mas_reset(&mas); > > /* > @@ -2792,7 +2794,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, > vma = merge; > /* Update vm_flags to pick up the change. */ > vm_flags = vma->vm_flags; > - goto unmap_writable; > + goto file_expanded; I think we might need a mas_destroy() somewhere around here otherwise we leak the prealloc? In later versions the merge operation takes our vma iterator so it handles that if merge succeeds, but here we have to cleanup our mas ourselves? > } > } > > @@ -2800,31 +2802,15 @@ unsigned long mmap_region(struct file *file, unsigned long addr, > } else if (vm_flags & VM_SHARED) { > error = shmem_zero_setup(vma); > if (error) > - goto free_vma; > + goto free_iter_vma; > } else { > vma_set_anonymous(vma); > } > > - /* Allow architectures to sanity-check the vm_flags */ > - if (!arch_validate_flags(vma->vm_flags)) { > - error = -EINVAL; > - if (file) > - goto close_and_free_vma; > - else if (vma->vm_file) > - goto unmap_and_free_vma; > - else > - goto free_vma; > - } > - > - if (mas_preallocate(&mas, vma, GFP_KERNEL)) { > - error = -ENOMEM; > - if (file) > - goto close_and_free_vma; > - else if (vma->vm_file) > - goto unmap_and_free_vma; > - else > - goto free_vma; > - } > +#ifdef CONFIG_SPARC64 > + /* TODO: Fix SPARC ADI! */ > + WARN_ON_ONCE(!arch_validate_flags(vm_flags)); > +#endif > > if (vma->vm_file) > i_mmap_lock_write(vma->vm_file->f_mapping); > @@ -2847,10 +2833,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, > */ > khugepaged_enter_vma(vma, vma->vm_flags); > > - /* Once vma denies write, undo our temporary denial count */ > -unmap_writable: > - if (file && vm_flags & VM_SHARED) > - mapping_unmap_writable(file->f_mapping); > +file_expanded: > file = vma->vm_file; > expanded: > perf_event_mmap(vma); > @@ -2879,28 +2862,54 @@ unsigned long mmap_region(struct file *file, unsigned long addr, > > vma_set_page_prot(vma); > > - validate_mm(mm); > return addr; > > -close_and_free_vma: > - vma_close(vma); > -unmap_and_free_vma: > +unmap_and_free_file_vma: > fput(vma->vm_file); > vma->vm_file = NULL; > > /* Undo any partial mapping done by a device driver. */ > unmap_region(mm, mas.tree, vma, prev, next, vma->vm_start, vma->vm_end); > - if (file && (vm_flags & VM_SHARED)) > - mapping_unmap_writable(file->f_mapping); > +free_iter_vma: > + mas_destroy(&mas); > free_vma: > vm_area_free(vma); > unacct_error: > if (charged) > vm_unacct_memory(charged); > - validate_mm(mm); > return error; > } > > +unsigned long mmap_region(struct file *file, unsigned long addr, > + unsigned long len, vm_flags_t vm_flags, unsigned long pgoff, > + struct list_head *uf) > +{ > + unsigned long ret; > + bool writable_file_mapping = false; > + > + /* Allow architectures to sanity-check the vm_flags. */ > + if (!arch_validate_flags(vm_flags)) > + return -EINVAL; > + > + /* Map writable and ensure this isn't a sealed memfd. */ > + if (file && (vm_flags & VM_SHARED)) { > + int error = mapping_map_writable(file->f_mapping); > + > + if (error) > + return error; > + writable_file_mapping = true; > + } > + > + ret = __mmap_region(file, addr, len, vm_flags, pgoff, uf); > + > + /* Clear our write mapping regardless of error. */ > + if (writable_file_mapping) > + mapping_unmap_writable(file->f_mapping); > + > + validate_mm(current->mm); > + return ret; > +} > + > static int __vm_munmap(unsigned long start, size_t len, bool downgrade) > { > int ret;