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 4253BD2FFEC for ; Fri, 18 Oct 2024 10:53:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C01456B0082; Fri, 18 Oct 2024 06:53:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B8A6A6B0083; Fri, 18 Oct 2024 06:53:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A03E86B009B; Fri, 18 Oct 2024 06:53:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 818686B0082 for ; Fri, 18 Oct 2024 06:53:06 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CC9D2141951 for ; Fri, 18 Oct 2024 10:52:53 +0000 (UTC) X-FDA: 82686410310.08.E62335B Received: from fout-a6-smtp.messagingengine.com (fout-a6-smtp.messagingengine.com [103.168.172.149]) by imf14.hostedemail.com (Postfix) with ESMTP id BC995100004 for ; Fri, 18 Oct 2024 10:52:51 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=shutemov.name header.s=fm1 header.b="S iMRMhq"; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=KljQwcUw; dmarc=none; spf=pass (imf14.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=1729248676; a=rsa-sha256; cv=none; b=i0TECZA7tZdmos8wr9b0mb3ig5aEZCP5lYirc/Nh2kZ7hFLBP/lJC2x89tRwk7TcJs+MTX Ph24yl/RcDVvU/tt/rM2uN32lza2+VSRXjg9ShmzjIGozFdxmEG0MLHavJm3Axtoea5u6a G5VaqrBnFsjKyjGtXjszwdmFfWaqdJw= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=shutemov.name header.s=fm1 header.b="S iMRMhq"; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=KljQwcUw; dmarc=none; spf=pass (imf14.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=1729248676; 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=6W65sQqMDsurY8A/6Sm3d4ObWPw0596AaopS8zSdd6w=; b=SnSPJRwBuWyM1dY07VDRa0xorSDn1i3U7fusUPFh9cBiZQ+yPoO2aalMCd7OfCk6jsyYC3 v5KWo+PdigURARRhexIFGpJayZz+Zv9Xag9T0vq8NKSV7f6mscA6No+4+CULYkNqU8anlU GpsjPdbCK0T96GqMvsteWTk7SJXjbEw= Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id A155113801DF; Fri, 18 Oct 2024 06:53:03 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Fri, 18 Oct 2024 06:53:03 -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=1729248783; x= 1729335183; bh=6W65sQqMDsurY8A/6Sm3d4ObWPw0596AaopS8zSdd6w=; b=S iMRMhqrpp9Jv+PjlcrogxZIb7ZKgWQZPfVJB4z1bDlu6lxgfRjUaKuRGmzbf1av8 ZSo6MxcvTbTCzpX77RxjsUecDYqgz6e2T8LaHaTfcvbHUNCVSlsYV9/iUhnjwj4k EbYxcZhrj1nZdk2VmVIyUHbHs84U/LbvYuSJe3cDwwvpf8k2l55pMkUlCOuBXI2t 3kieMbWHzbbAHSJzlabVqnOHK/2tJAoG9iIpRadOc2/TATPcjx3UvU24c+6t9I1W itlT1sOLOkx2iXZlfHcH0GczgK6rvz7CRJD8fS5frg9qjR4Ard/05gz/D9szZKEP MwJtF99tn9EOSucuZ8AwQ== 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=1729248783; x=1729335183; bh=6W65sQqMDsurY8A/6Sm3d4ObWPw0 596AaopS8zSdd6w=; b=KljQwcUwq9bmyaW1/EvIWDgVw9ayiUtaLt0DysPnxNCA B8clPurdUYtmG4+e7pzGOppS9GOmmK9QKkNiOw/BnVy44eqfaJqsbrHxDn2bs+7E DOxnsU7VdfKcsFYEjH3IRFSX30Mqog6kciACE68iyG9wSpqKtAgjpPYhvL7Yoeow wPTx/21iGlWdKpuV/NIxF2gXFayDJ/NIXB50eOIUG3ZvwSQ8tkDs4o2h3Jq9ps2p 0Fx+ABTOxxVHtRMLt/5fwJ9ong2cTSCni1sNBvN/HsoL/cJuglTL6vX+zuLCQXIB TapH9HWW7BST1go5VyiwG4eFacsDlYL0zZUe+x18LQ== 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:52:56 -0400 (EDT) Date: Fri, 18 Oct 2024 13:52:52 +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-Rspamd-Queue-Id: BC995100004 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: zscnetn16sym76bdxykqkfx5thxbynog X-HE-Tag: 1729248771-770445 X-HE-Meta: U2FsdGVkX1+FBGRbItE/fH4BtN7fgKyUiQzsxaNWvuaJ37hIEm++whobdqXgHzaJhreGBmQsQszqPR5dhbnU2Cxv3/rxR4+lGXYtuyNzJ6YTdPKfk2lxWybzunl8qt7SFTSpo9F07o4X6xxDI6tsGWoygm9/8XmrhgwbGF7/gGToZUes31HJ2x0jn/sojAJTLv9u+VbyYcOkAVwPvkkVRnPADTnRyZS3as3v/AuQgbcTjprSjxA4ZZRK8HVAj+eI0fk0ZGFM22jVib3+eUHMJ7EGGQleU59Qyhzb1kbjCj6OFRXvvDo5qD2z0PaqR6uE5teyCLY3HpMty2f13j575tgdU7tjoCjLghlL05iwDWi5cxD8jKsZgHAP3OBY179x5J+V4paQeFDBkkVcFkLPtxfOficefZq/fz+lxV6OcwI3YFgfE0lwiwNxN4dINpADGHfqgRlh08JRUqyk/D4ggZcVsC0QHwp07Ek9fYPT7QW45QRxHUNk1619ecz5LZL6opsSl5jDZ1mw7kkdS/OsVb+ckdbAJQuIgr7LH8tnqDaAbF7Moi0f4rhsqKkcIm7ZstSWQBLdvifo37+K/HlCT+q9h7rFyFGip0jFM6f0PpEB7F4oUeKtbttEV8UryL3o9j69oPfjBfEaoODW/rt4zBypBsqi7cHDqOd7JbYUouI2Gm475pdAaVXNX7/zdB1nPdVc9TfkqwAgYwdnScFX3uBsMLClnhO8eBrjQtEezbiDjb8qB8yJZPGUOzOvw16ysCvuDVRBm77wSrq8gITKSRAf23XTbc2yqE3pviip/4eDpAEO0gkHI9mVyw0zDMDZgzGuCN6/f4QDW7xBBd1qqIakjGPCnwJBtU3Rqy1LuzVMLeHSatIljZ1cfmDh9QJV66etERGAD6OWBIPezj084Op2FskwvnIxZloTgyXkvtUDmsXGsPZNOWOOE2V5etP0MTMrYqx6aW73dwwXkRz +ZSuSE3u bCIIbUrtox14LhrSh0BypwWq83TCFIUG0r5yWze9ormQ9f7VjwucXLrfkRPXt7ydcmRuWbX4j2DE8EVB8O1GYXG6hSS1aE9YPXWIDqXvEoiqPkFCIegveW2DFFQZE4ifBLOQxXHvzL9/Yp75/YAHTs5owOlh6Iqo9n5+grXL65wwP5xoYCoL8jIH7GH9HL654Y286zi2b9026vxNDSsheru54JWUnxaCI+dSWsDYf95sZW6etiMTueOBD3ZzCBAcrvwMyU3wKVR0vyXVKgem9v/hxbaH7Ajk/FVOd/zxorZ5Hwg8tv36GtLNFzJTfqGfdAw+9DSt/HpAnRNVmudq6IzqeYoMg6zDN4lJmSquH4lpDWWdKqXm2dZfcrXX7cEc/p7Lyxd7804kQ1qa6HXbCpyGwBEjT1nbeiBongh4r3yAU+Qxth1LhUXjLbw== 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:49:21PM +0300, Kirill A. Shutemov wrote: > On Fri, Oct 18, 2024 at 11:24:06AM +0200, Roberto Sassu wrote: > > Probably it is hard, @Kirill would there be any way to safely move > > security_mmap_file() out of the mmap_lock lock? > > What about something like this (untested): > > diff --git a/mm/mmap.c b/mm/mmap.c > index dd4b35a25aeb..03473e77d356 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -1646,6 +1646,26 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, > if (pgoff + (size >> PAGE_SHIFT) < pgoff) > return ret; > > + 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; > + } > + Emm. We need to restore 'ret' to -EINVAL here: + + ret = -EINVAL; + > if (mmap_write_lock_killable(mm)) > return -EINTR; > > @@ -1654,6 +1674,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, > 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 +1711,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 -- Kiryl Shutsemau / Kirill A. Shutemov