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 B8AF8C77B7C for ; Mon, 23 Jun 2025 15:00:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 541AA6B00AB; Mon, 23 Jun 2025 11:00:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F2086B00B4; Mon, 23 Jun 2025 11:00:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 393226B00BA; Mon, 23 Jun 2025 11:00:12 -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 249276B00AB for ; Mon, 23 Jun 2025 11:00:12 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DB2EA806E3 for ; Mon, 23 Jun 2025 15:00:11 +0000 (UTC) X-FDA: 83586975822.08.496A679 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf29.hostedemail.com (Postfix) with ESMTP id 4910D120008 for ; Mon, 23 Jun 2025 15:00:09 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=LsltKSh7; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=3QGGQPQY; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=LsltKSh7; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=3QGGQPQY; spf=pass (imf29.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=1750690809; 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=7/Jc4wLf1uWOsp0HxTYybBk/EP+fch0a8kNEf01YT1k=; b=mliz16mN9rFcNbzywppkakIar8ymnSGsR9AqdHGZQh17fhZjlQgA78jdBUNj7x7QjQx2Nb Cj25O6eYpj/ELX06podflh/lSLd9WOvuwfgCUEpE4IaMlkfl/I1oeinE2IrZd6RZ4fd0wW QLLR3Ky++LUuEJedgVgP+vtQzwv0RBo= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=LsltKSh7; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=3QGGQPQY; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=LsltKSh7; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=3QGGQPQY; spf=pass (imf29.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=1750690809; a=rsa-sha256; cv=none; b=QorIK4j0oVrCPiwx40KkONyCPYBMl3WgFIhrKveRNq/+s/lPWypEXKU3IIviC2ROCEH69d V/1n83jmjcI3nP2mgKjqWXZxvZQmpSWUIk0ziyDdRC5la6+OQksL34W9T/gN6q++6+wuDf InPBNF//+Yp1Ugr39OaozP3t62/duVw= 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 DE44B21171; Mon, 23 Jun 2025 15:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1750690807; 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; bh=7/Jc4wLf1uWOsp0HxTYybBk/EP+fch0a8kNEf01YT1k=; b=LsltKSh71DUd1V0Wu/8KDakVY1WVlIt5xD3Y97gJP+m4K+U20L3u1CAnSZZBn47m95IKfW DEnz935sWGXUhUypl1o+8KpMKODz9kmk1R3XAKKumaUTLMp/t7P4yorE8/EZUOrWNZfaHF 0bmRU0cCsg9dVQvoz2c9V6GjQBI9hno= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1750690807; 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; bh=7/Jc4wLf1uWOsp0HxTYybBk/EP+fch0a8kNEf01YT1k=; b=3QGGQPQYlA/R+gdMm5D1wKLHbSkMiEAxL3TKRSFmSaRooBk/hYdp38KCO+d6ot/ASHzlH+ C6CvsiMueITxR2Bg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1750690807; 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; bh=7/Jc4wLf1uWOsp0HxTYybBk/EP+fch0a8kNEf01YT1k=; b=LsltKSh71DUd1V0Wu/8KDakVY1WVlIt5xD3Y97gJP+m4K+U20L3u1CAnSZZBn47m95IKfW DEnz935sWGXUhUypl1o+8KpMKODz9kmk1R3XAKKumaUTLMp/t7P4yorE8/EZUOrWNZfaHF 0bmRU0cCsg9dVQvoz2c9V6GjQBI9hno= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1750690807; 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; bh=7/Jc4wLf1uWOsp0HxTYybBk/EP+fch0a8kNEf01YT1k=; b=3QGGQPQYlA/R+gdMm5D1wKLHbSkMiEAxL3TKRSFmSaRooBk/hYdp38KCO+d6ot/ASHzlH+ C6CvsiMueITxR2Bg== 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 C64F113AC4; Mon, 23 Jun 2025 15:00:07 +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 cMwkMPdrWWi8cQAAD6G6ig (envelope-from ); Mon, 23 Jun 2025 15:00:07 +0000 From: Vlastimil Babka Date: Mon, 23 Jun 2025 16:59:50 +0200 Subject: [PATCH RFC 1/2] mm, madvise: simplify anon_name handling MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250623-anon_name_cleanup-v1-1-04c94384046f@suse.cz> References: <20250623-anon_name_cleanup-v1-0-04c94384046f@suse.cz> In-Reply-To: <20250623-anon_name_cleanup-v1-0-04c94384046f@suse.cz> To: Andrew Morton , "Liam R. Howlett" , Lorenzo Stoakes , David Hildenbrand , Jann Horn , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Colin Cross Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Vlastimil Babka X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5386; i=vbabka@suse.cz; h=from:subject:message-id; bh=4WsgUXbLY0jc0mbRG783m2rvtMBeNkFlZ+M53fOqgQc=; b=owEBbQGS/pANAwAIAbvgsHXSRYiaAcsmYgBoWWvx+Oz6hY4snQoKDFRhXbnRE58Be0Ib+D0Ix Y1TfxhA9yOJATMEAAEIAB0WIQR7u8hBFZkjSJZITfG74LB10kWImgUCaFlr8QAKCRC74LB10kWI mso2CACBbp5TpPZEK987JqU7y7hewVG041bmZcQcTHTMISg3CzJmkx4bR/8VBOHGcmJ6SdycVHG /CyS2Pzjq7ZE5ESEltg5jEsEJgL9ApB61yWTKMhL4gUOuwMDBY7oP1d1Rt29fj/4MIHPeUOACWA ejdSwt380Vw1BTnL+VzvVvTI7BchJzP6K/tbdJic3NYlg8XH+HPx2nKs4zcKk0V9DRvfEb9h8HB 5GNuIG7WmscJyLpg6g69jiUDse+zHfWyBxp3qbu1cfhRs2Zvn0SZR/bbCUOrMeyI6pOgcTnYhVw 1RF23CSkMW9Ckr9jkrfXsEIgTaw1D986nFJ10bIm7sZuGcwd X-Developer-Key: i=vbabka@suse.cz; a=openpgp; fpr=A940D434992C2E8E99103D50224FA7E7CC82A664 X-Rspamd-Queue-Id: 4910D120008 X-Stat-Signature: qqb1b9x9sdhrndbgz49c8fqg5yyui39x X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1750690809-465849 X-HE-Meta: U2FsdGVkX1/Hlt/yKlkY+5cDCk2LNHZyhGIGKkke9ocCYvdt8OhhD+Ely/nPr0G1bjkuTM99fkxgkM5bTl7ut7kzDfKwM4vGBuy/vwx/hOHmy5/e68mRgbthrV5NTmG+zIfr+zM4BErJKvtOC1xxaKjTMWi+5+a8sAKF47LTnnRwYJbdGsRkHVhMg360KxeXcg58Rp72NNT138dEItg5v/q3hrBO7DwMQduFyMZdedERAMxrYF+QvpftfsB5nWjh1XwGwkXO7yfT37j+vHnwy5FGlV5NtVAH0xIj0RZ27gfAMMjI10lAuzvT/G46Gd6BAZmGsStzG29NxtTm+f0XJc0wBkWqimJ+15BWRUL+QybYGv7vYoxRc9v7YbU9uNRUV2QjpQEy3onE1PiAuo5H8Uql8Cquk3ffxhjpslkgtFt1lVjZnngbxhKAhwDtIkw3jSb1Pr60x2N6A52Lpe2di1MxgXKv0ICbIfTfl5tBARbgRu9jlr3Qzvlt1H1hl9dv5O4d/o7eDNza3yie4KnHtYjdpfCF0INag7yUHlNc8amlvAdzGaxHkUCWLk2gSb3+4Da/PHcgpF4+BE+yZTznx4q35VNIm99+Xg9+6FwLbjRv+l8kYnFXPIUfI+7yYoM+VVcUHjjj1YWHB/AdQgzpxvBkEFywFxLF2rx7Xet2Z5TtmoAMM3uhtq+PEh5vJwKcZe+3RFLkd31bP58WYjBhzt/kFMIw/14Dct1/+ue7IcdOtkY1TBR7ByCnw+cvK9obkIbIqFYk96G5LLvuSeLssUsbZbOWfmp9157KTASnFHyZTlPWvOJfAEnJRXGWOPO5J0mGNHF5Pby2P1vJ3p2CNCJpuGgDs9vJZZJCaQfyCKuS5/X46A1nEpKI9csQ577MwHXXpGntj9JR9iTLzu9MbkOI8Icoh9suFJ72m2xwbcFJRPpSSFN3TlQwzdzzJz87mC67kevSmI5/xICs58v 9fbty0Zp jUCqCdhUuiyl0UreDcnGsMUXIK0QRh8ecY3J3UbC/Jwt/K+DYbeqnB3ZuDHMkuN1Djch8FmJJmC+7lumpXqS11mhvyUSKRL21Cte4UmPBmhgXxKNaXWI3+b9lp8+Ta8adQ3lpIggZGpPnQreUZVsZspLupUJdj8+sLVT4sKbEH86AjR688Pb6CeZl4COv9suVyigW/dkuxvqPiVKMfvRGqvMVSv50WJOplBrMVWrAqxg4XTyWGF4ZgO2/P6jwCU8g+eRu8201XjYe3yF7Iu0ON2o+tAXvJDI+1X1YBpoE3KcAOus= 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: Since the introduction in 9a10064f5625 ("mm: add a field to store names for private anonymous memory") the code to set anon_name on a vma has been using madvise_update_vma() to call replace_vma_anon_name(). Since the former is called also by a number of other madvise behaviours that do not set a new anon_name, they have been passing the existing anon_name of the vma to make replace_vma_anon_name() a no-op. This is rather wasteful as it needs anon_vma_name_eq() to determine the no-op situations, and checks for when replace_vma_anon_name() is allowed (the vma is anon/shmem) duplicate the checks already done earlier in madvise_vma_behavior(). It has also lead to commit 942341dcc574 ("mm: fix use-after-free when anon vma name is used after vma is freed") adding anon_name refcount get/put operations exactly to the cases that actually do not change anon_name - just so the replace_vma_anon_name() can keep safely determining it has nothing to do. The recent madvise cleanups made this suboptimal handling very obvious, but happily also allow for an easy fix. madvise_update_vma() now has the complete information whether it's been called to set a new anon_name, so stop passing it the existing vma's name and doing the refcount get/put in its only caller madvise_vma_behavior(). In madvise_update_vma() itself, limit calling of replace_anon_vma_name() only to cases where we are setting a new name, otherwise we know it's a no-op. We can rely solely on the __MADV_SET_ANON_VMA_NAME behaviour and can remove the duplicate checks for vma being anon/shmem that were done already in madvise_vma_behavior(). The remaining reason to obtain the vma's existing anon_name is to pass it to vma_modify_flags_name() for the splitting and merging to work properly. In case of merging, the vma might be freed along with the anon_name, but madvise_update_vma() will not access it afterwards so the UAF previously fixed by commit 942341dcc574 is not reintroduced. Signed-off-by: Vlastimil Babka --- mm/madvise.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 4491bf080f55d6d1aeffb2ff0b8fdd28904af950..ae29395b4fc7f65a449c5772b1901a90f4195885 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -176,21 +176,25 @@ static int replace_anon_vma_name(struct vm_area_struct *vma, } #endif /* CONFIG_ANON_VMA_NAME */ /* - * Update the vm_flags on region of a vma, splitting it or merging it as - * necessary. Must be called with mmap_lock held for writing; - * Caller should ensure anon_name stability by raising its refcount even when - * anon_name belongs to a valid vma because this function might free that vma. + * Update the vm_flags and/or anon_name on region of a vma, splitting it or + * merging it as necessary. Must be called with mmap_lock held for writing. */ static int madvise_update_vma(vm_flags_t new_flags, struct madvise_behavior *madv_behavior) { - int error; struct vm_area_struct *vma = madv_behavior->vma; struct madvise_behavior_range *range = &madv_behavior->range; - struct anon_vma_name *anon_name = madv_behavior->anon_name; + bool set_new_anon_name = madv_behavior->behavior == __MADV_SET_ANON_VMA_NAME; + struct anon_vma_name *anon_name; VMA_ITERATOR(vmi, madv_behavior->mm, range->start); - if (new_flags == vma->vm_flags && anon_vma_name_eq(anon_vma_name(vma), anon_name)) + if (set_new_anon_name) + anon_name = madv_behavior->anon_name; + else + anon_name = anon_vma_name(vma); + + if (new_flags == vma->vm_flags && (!set_new_anon_name + || anon_vma_name_eq(anon_vma_name(vma), anon_name))) return 0; vma = vma_modify_flags_name(&vmi, madv_behavior->prev, vma, @@ -203,11 +207,8 @@ static int madvise_update_vma(vm_flags_t new_flags, /* vm_flags is protected by the mmap_lock held in write mode. */ vma_start_write(vma); vm_flags_reset(vma, new_flags); - if (!vma->vm_file || vma_is_anon_shmem(vma)) { - error = replace_anon_vma_name(vma, anon_name); - if (error) - return error; - } + if (set_new_anon_name) + return replace_anon_vma_name(vma, anon_name); return 0; } @@ -1313,7 +1314,6 @@ static int madvise_vma_behavior(struct madvise_behavior *madv_behavior) int behavior = madv_behavior->behavior; struct vm_area_struct *vma = madv_behavior->vma; vm_flags_t new_flags = vma->vm_flags; - bool set_new_anon_name = behavior == __MADV_SET_ANON_VMA_NAME; struct madvise_behavior_range *range = &madv_behavior->range; int error; @@ -1403,18 +1403,7 @@ static int madvise_vma_behavior(struct madvise_behavior *madv_behavior) /* This is a write operation.*/ VM_WARN_ON_ONCE(madv_behavior->lock_mode != MADVISE_MMAP_WRITE_LOCK); - /* - * madvise_update_vma() might cause a VMA merge which could put an - * anon_vma_name, so we must hold an additional reference on the - * anon_vma_name so it doesn't disappear from under us. - */ - if (!set_new_anon_name) { - madv_behavior->anon_name = anon_vma_name(vma); - anon_vma_name_get(madv_behavior->anon_name); - } error = madvise_update_vma(new_flags, madv_behavior); - if (!set_new_anon_name) - anon_vma_name_put(madv_behavior->anon_name); out: /* * madvise() returns EAGAIN if kernel resources, such as -- 2.50.0