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 05C8CD2FFEC for ; Fri, 18 Oct 2024 10:55:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 833B76B0088; Fri, 18 Oct 2024 06:55:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7E3D96B008C; Fri, 18 Oct 2024 06:55:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6838F6B0093; Fri, 18 Oct 2024 06:55:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4AC766B0088 for ; Fri, 18 Oct 2024 06:55:57 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B1C60418B6 for ; Fri, 18 Oct 2024 10:55:49 +0000 (UTC) X-FDA: 82686417702.16.CB1E09E Received: from fout-a6-smtp.messagingengine.com (fout-a6-smtp.messagingengine.com [103.168.172.149]) by imf15.hostedemail.com (Postfix) with ESMTP id C834FA0022 for ; Fri, 18 Oct 2024 10:55:43 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=shutemov.name header.s=fm1 header.b="N 0fx2Gu"; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=pKasBn9E; dmarc=none; spf=pass (imf15.hostedemail.com: domain of kirill@shutemov.name designates 103.168.172.149 as permitted sender) smtp.mailfrom=kirill@shutemov.name ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729248920; a=rsa-sha256; cv=none; b=WgNU1FZR1RDOZW33arsTYLdDbGAFbRNAKgNBgi9bHNoXCtmvaish2e7gDmyJm6CP/oWWST yo3hQ9SMthY5LL+LL4SzzPM5TRB8grLwJUpfbXaOY9ppjY3WIXsWMxoONXk+TyO/TjCe75 HnlDvaMx9gufnLoUUgMiEgycw2gX8kU= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=shutemov.name header.s=fm1 header.b="N 0fx2Gu"; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=pKasBn9E; dmarc=none; spf=pass (imf15.hostedemail.com: domain of kirill@shutemov.name designates 103.168.172.149 as permitted sender) smtp.mailfrom=kirill@shutemov.name ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729248920; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=coMOZENDUaYWTXt7cXYmH0d3DtZlK6a7sVVMJT6B6Dc=; b=Ep/D5TebIJNNYTJ9a6hFT1QNRftjCIjkIYu6FDqZqhFZteFStI174GepnLyoS6lhCLe6Gw NK6+ZE+HhymV/Djmym9Ga1dOVL0v3K7/2Ccaw2T2di0/Q7RbfZcBoTQqzNVxUfRWlStGBD cW6GuyF5uf2LCPswtv8HBG6rSyfbUU0= Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfout.phl.internal (Postfix) with ESMTP id 2F5B31380479; Fri, 18 Oct 2024 06:55:54 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Fri, 18 Oct 2024 06:55:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov.name; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1729248954; x= 1729335354; bh=coMOZENDUaYWTXt7cXYmH0d3DtZlK6a7sVVMJT6B6Dc=; b=N 0fx2GuQeMjXxyE4BUBl0q3/ytz/BAgihIyBjZPLF2jp4ogyk/5b0Hp67pA0qV1qk ho/AGR29sRNe7bJ2mSx7bbcTViyRVOYDtxZfhThD2jAN9oPHR7UK5ePZhIgsz07I I5In8z9Ha2hCmXg2maWyv5nS12G8qRc2dlrIl4SiQ01NPOJP/bw3KGeJc9wHOTrI sfBJ83erirJVTVjC9Y24J9EO6DdliZ9v68ktMbL5NKdqxzsLdf7tYPcCWypDdESb zx3VSVKRmPDzbKc+nu0qQhUS3hKPlPlMS4HvBzUqvH4ExOOPzzLZ5IB0pIF25ERO lMw9ucLkUmFPffHD+EOTg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1729248954; x=1729335354; bh=coMOZENDUaYWTXt7cXYmH0d3DtZl K6a7sVVMJT6B6Dc=; b=pKasBn9E20HLlGAMit47bAqeix+GvyTQ/e1M8hxjbYA0 +V2MxZag79xhgd2PQRGr2I4hC3TSkIy8vwbqNPnfs38e5kA6C21HBi/6u8ulJigP OAZ/tf8AIiTLfBUTAIk6vr09R8CqkAc3kM9CuXchPH38nPlvgderDdP/T4flyiPa hOptzPnHTCsnNV0YnJQuiBCgGcirttXnbv17CJB5b221TMZlHt62dsGlzAXQtzOg dGFBD0/uzSaEwB2HxeIj+sMoaDu8VFLZDgnGMFXVh6palCTiaAFkQBqHk35mcsim DXuJrRSZQAg9Z4zBeByCnA22Fs8vyEp6ECTm3j7aAA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehfedgfeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhepfffhvfevuffkfhggtggujgesthdtsfdttddtvden ucfhrhhomhepfdfmihhrihhllhcutedrucfuhhhuthgvmhhovhdfuceokhhirhhilhhlse hshhhuthgvmhhovhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeffvdevueetudfhhfff veelhfetfeevveekleevjeduudevvdduvdelteduvefhkeenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehkihhrihhllhesshhhuhhtvghmohhv rdhnrghmvgdpnhgspghrtghpthhtohepudelpdhmohguvgepshhmthhpohhuthdprhgtph htthhopehrohgsvghrthhordhsrghsshhusehhuhgrfigvihgtlhhouhgurdgtohhmpdhr tghpthhtohepphgruhhlsehprghulhdqmhhoohhrvgdrtghomhdprhgtphhtthhopegvsg hpqhifvghrthihgeejvdduvdefsehgmhgrihhlrdgtohhmpdhrtghpthhtohepkhhirhhi lhhlrdhshhhuthgvmhhovheslhhinhhugidrihhnthgvlhdrtghomhdprhgtphhtthhope iiohhhrghrsehlihhnuhigrdhisghmrdgtohhmpdhrtghpthhtohepughmihhtrhihrdhk rghsrghtkhhinhesghhmrghilhdrtghomhdprhgtphhtthhopegvrhhitgdrshhnohifsg gvrhhgsehorhgrtghlvgdrtghomhdprhgtphhtthhopehjmhhorhhrihhssehnrghmvghi rdhorhhgpdhrtghpthhtohepshgvrhhgvgeshhgrlhhlhihnrdgtohhm X-ME-Proxy: Feedback-ID: ie3994620:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 18 Oct 2024 06:55:46 -0400 (EDT) Date: Fri, 18 Oct 2024 13:55:42 +0300 From: "Kirill A. Shutemov" To: Roberto Sassu Cc: Paul Moore , ebpqwerty472123@gmail.com, kirill.shutemov@linux.intel.com, zohar@linux.ibm.com, dmitry.kasatkin@gmail.com, eric.snowberg@oracle.com, jmorris@namei.org, serge@hallyn.com, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Roberto Sassu , linux-mm@kvack.org, akpm@linux-foundation.org, vbabka@suse.cz, lorenzo.stoakes@oracle.com, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH 1/3] ima: Remove inode lock Message-ID: References: <20241008165732.2603647-1-roberto.sassu@huaweicloud.com> <7358f12d852964d9209492e337d33b8880234b74.camel@huaweicloud.com> <593282dbc9f48673c8f3b8e0f28e100f34141115.camel@huaweicloud.com> <15bb94a306d3432de55c0a12f29e7ed2b5fa3ba1.camel@huaweicloud.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Stat-Signature: q34s85zactmapjqmg51515pea8p8y4js X-Rspamd-Queue-Id: C834FA0022 X-Rspamd-Server: rspam02 X-HE-Tag: 1729248943-756555 X-HE-Meta: U2FsdGVkX18HXZwEV6p2qCDbSEwI4XzfYdjZUgO4mwDRkWyXOOcX6eOjVzbyLD1kT0AJS1J8CvkV70yTm45MS40IZn995pFo1jA842SuT2AKvExV7mMEr4vphfcJZK8kqlu0WQxxeYS7+hwFCVYyhsxxi4DYh9UnVmthBnlUw5ClNUmymYFoYRIK4YPc2uCYfKBczLq4kfUCO6ZQzfYigyragWWigeMi9D72Ui2nIm9pQkgQrGVF5BcKwpSLN4e4VSYy/wBTCP4tkKnbKmDV8kWWgjwG9a+its8fUHjbJpZxqB+OR/n95fA7Ytfe9sFC4y/fjRlXeC12OkDJWhCFwslnvAMENJss3IgTyg+X9SpGxhRv1ijD4En9YzS5q+w/VaKfnzX37VXpuGQyk2AVE2pHnKHO8cvC26ZQl8CL/iaotzZqGIVzTWfrqtifRXerC6WhOOD7vL6egsJtQOyWDGKgRiXoh03iSODDcba6aDlQ9CbSwSDYuUONf4DeSyzbGKEBuotFMRsRuZxb3x5qCPGjRk3Ui49HJ5Jp0nPFP53TZWHXoUYNAVt/QI+4FaCX4Y1VOv4fPY5VpDVnGY8eYkjiN/i5V6V+wfandIp5A4aNsqmF5xZGflzo9lwSBtMlt/kiZ4QWFPOodOak3+lfraYqblWadWNwIK0sh5K3qYWJcE4r5Bi1sw6yHpEUYsOoEJG4+FSCwhmyLt5o5sl4HRWq+yVKqpZNidRnedPF8xuUEujQmvfjPdSGiHxvFdTZ8aSFzj88ldzCAehNqcgEMl91DKnbNhGODoWTrtby1q4Gee3w+7iUTfltCc1Xltw/x6s1YYxHJTbZpR9KkqLdcRotBHKaPlOWHbc8wxbCEAHB8Gl63EfIsbSLYkvn0dWniIHPCfZKgPjf90dhkvvD6+9VPNwrbYhkRbLB2CQ525UJFZspX02ykYurbqN2M51Ii4JDNcFgluJVmC/tQOw wFDyZPd8 qWu8JOINL8EbT511tKVTsrGoFcpj/wo0AEeuG1hmfabr0NcWvIK+zXPBFHqAXU2vLd6a8OBzyIteLfLPkiI2p3mnZPRw2GmB9qeDByhMmfKGNhn93lYV66L18cXJ6DyLpS89IHw97yatmfon8K/JZrpn/hdbU+trPoWDb+/c/LVvLeRqyD6BfymcDQKxck46d71p9SCF8kyg1J636Ck7KQzpAscKNc3NxTmkVDjesNjT7uHc8+0XqmzIPE1k2fVLCFCPSXwqL/cZqPS02Laf1PC4nFduUPyGEk0nRuWeOSgeDmWTSUSZV6SJI31MJIkS9YTORUmTlzl++DvJVY9vpaIgpf6Nk5nrriUDrmSDyw9WQFnMzLVnsdxCcWAFm+JLDtx26iAaIL0RvHL8tsXXOd+ba4hks23BQIgoRSkKQd+7l67lt3ZVMKOdRYA== 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 Fri, Oct 18, 2024 at 01:53:03PM +0300, Kirill A. Shutemov wrote: > > + mmap_read_unlock(mm); > > + > > + ret = security_mmap_file(vma->vm_file, prot, flags); > > + if (ret) { > > + fput(file); > > + return ret; > > + } > > + > > Emm. We need to restore 'ret' to -EINVAL here: > > + > + ret = -EINVAL; > + > > > if (mmap_write_lock_killable(mm)) > > return -EINTR; > > And fput() here on error. Updated patch: diff --git a/mm/mmap.c b/mm/mmap.c index dd4b35a25aeb..7c1b73a79937 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1646,14 +1646,41 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, if (pgoff + (size >> PAGE_SHIFT) < pgoff) return ret; - if (mmap_write_lock_killable(mm)) + if (mmap_read_lock_killable(mm)) return -EINTR; vma = vma_lookup(mm, start); + if (!vma || !(vma->vm_flags & VM_SHARED)) { + mmap_read_unlock(mm); + return -EINVAL; + } + + file = get_file(vma->vm_file); + + mmap_read_unlock(mm); + + ret = security_mmap_file(vma->vm_file, prot, flags); + if (ret) { + fput(file); + return ret; + } + + ret = -EINVAL; + + if (mmap_write_lock_killable(mm)) { + fput(file); + return -EINTR; + } + + vma = vma_lookup(mm, start); + if (!vma || !(vma->vm_flags & VM_SHARED)) goto out; + if (vma->vm_file != file) + goto out; + if (start + size > vma->vm_end) { VMA_ITERATOR(vmi, mm, vma->vm_end); struct vm_area_struct *next, *prev = vma; @@ -1688,16 +1715,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, if (vma->vm_flags & VM_LOCKED) flags |= MAP_LOCKED; - file = get_file(vma->vm_file); - ret = security_mmap_file(vma->vm_file, prot, flags); - if (ret) - goto out_fput; ret = do_mmap(vma->vm_file, start, size, prot, flags, 0, pgoff, &populate, NULL); -out_fput: - fput(file); out: mmap_write_unlock(mm); + fput(file); if (populate) mm_populate(ret, populate); If (!IS_ERR_VALUE(ret)) -- Kiryl Shutsemau / Kirill A. Shutemov