From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E70B1ACED5 for ; Wed, 30 Jul 2025 01:52:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753840381; cv=none; b=mtwg6qg9VL6Wfx1KGaW17fzJJh7n/SCLJkpW3CgSo0ulLMaL+anVSSiwZkbHmG34/ycf7gfHBkU4p9huQp56528zys4768p3ufj0WBJZe9xuHT1Z10GiucnDUwI3rmJLpxMP8vbH+E6Ai2qhaslYgh66tLXOCxlabkuaswtS5t8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753840381; c=relaxed/simple; bh=O9XlaVi+t9Iw0lUXpUHlLLCuOSeTamS35o68KXmOAI0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qLqHaE96/4G5QNtX/DNS+v+sYPYHLvDQsiUGRkf2LaNl4jHq4TcwBx4tAtJGRDcyeRXXQj+1dZnSJ3aKLSPmfoc7RsNHycvCJqo9YxQxgBAUEUOY3R3wmI4p4s4c3vQvoO/3JR/DZakZVFPe3kjtran4gZSgjEIw1fpeUPp4V+k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--isaacmanjarres.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=L6IYEpWP; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--isaacmanjarres.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="L6IYEpWP" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e8e12e6bdf9so3097246276.2 for ; Tue, 29 Jul 2025 18:52:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753840378; x=1754445178; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=EFr/UvDdK6SWWx6RBLxb5NvZO6MxbSmkX1gTh8Tsnig=; b=L6IYEpWPwPJmuL3GabwliAl07puer060u7nbtc8Z3eaDlp5eH6PtA31s/hfJSqxIR7 aGmfGCB4M/6DfYFF3mH+vn//r5HzNCG9UtVvz5CiffbnmKpB3OXxeX56uWDGti/uD/cC u4GV+GykOhbf8AyXAdKc5qXsV25xhKJjGSpTRS1N7TWW1SGw42XedmNx72IcnimkMIHe L8BnDmA2RuK6Z5f4ZkSE5Yo4Vuxtzx+cJk2BLZcXDTTpNiwdcg6Zo0b7qSRs1v09YQCc x3GJn/fN27I7ba+QdnAe/pb5g7amw3J5xkE7fHnCt+EgbahSJxgN01KQCoaQJ46x3pKj 1Xbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753840378; x=1754445178; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=EFr/UvDdK6SWWx6RBLxb5NvZO6MxbSmkX1gTh8Tsnig=; b=onkPic610ZE0vaJGYUuwJZ9rA86bSlkps1uoOD1NYB9NzVLaOS2GQSmxGY5DimuRwh vC1UuQAzckyyAjKluvhrG5418EPYxvi4JUAiKb4LdayfDdYGn2q5SYGudenzGFZN1DOi ftywdVSIlV/11RMqWc0K5P389RJE1fIFCyjXEEKDQF1xlyOtLqTHS/lhgsE5gtEtp4dd g3m7OFCGKKMsOYIIvCrPvVPnLHFvs02f1G49e4apETQGndSHIiGW+59dZyuKrtNXgWRX 420/EzU4ArfrVPsFI89q4CZ2hoU7xqVq3KCDvaSqA4BaIq8m1YaMJt8sHOpCuOnIrcLP pEHQ== X-Forwarded-Encrypted: i=1; AJvYcCVb5DHm25noQ7mjxRmwzvVxACSi1aj9os0ivXwj93yN0xxxUpXyk+bHnNDZxcwn+Y/vHRca3IE=@vger.kernel.org X-Gm-Message-State: AOJu0YzSN3BDtmXde5kouYDQrAuZsq9cjfyp6IpDheC7zfikLILuv3wf Kpv2+2LLWpGHmSHwbLKxcfiL+KyF0oyqrcyPk3lnv7m1xJ0LMgyAqgoiwxxFfvH1sKBTJAoIny3 JCtnh0w56tYX9njcFDgi18iyNDnpeWMLgOb/kIg== X-Google-Smtp-Source: AGHT+IG1cJhmCCZIkkMafM0jzony5iZe8ksvoa9M4ezF0eX0aWEDihWVZCPpSJiee5XVHyXovfPD3ubRCc8t5wyjc8VHNw== X-Received: from ybbdt4.prod.google.com ([2002:a05:6902:2504:b0:e8e:be3:249e]) (user=isaacmanjarres job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6902:160b:b0:e8e:290b:7f91 with SMTP id 3f1490d57ef6-e8e314d390amr2232654276.6.1753840378293; Tue, 29 Jul 2025 18:52:58 -0700 (PDT) Date: Tue, 29 Jul 2025 18:52:41 -0700 In-Reply-To: <20250730015247.30827-1-isaacmanjarres@google.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250730015247.30827-1-isaacmanjarres@google.com> X-Mailer: git-send-email 2.50.1.552.g942d659e1b-goog Message-ID: <20250730015247.30827-3-isaacmanjarres@google.com> Subject: [PATCH 6.1.y 2/4] mm: update memfd seal write check to include F_SEAL_WRITE From: "Isaac J. Manjarres" To: lorenzo.stoakes@oracle.com, gregkh@linuxfoundation.org, Muchun Song , Oscar Salvador , David Hildenbrand , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Hugh Dickins , Baolin Wang Cc: aliceryhl@google.com, stable@vger.kernel.org, "Isaac J. Manjarres" , kernel-team@android.com, Lorenzo Stoakes , Jan Kara , Alexander Viro , Andy Lutomirski , Christian Brauner , "Matthew Wilcox (Oracle)" , Mike Kravetz , linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" From: Lorenzo Stoakes [ Upstream commit 28464bbb2ddc199433383994bcb9600c8034afa1 ] The seal_check_future_write() function is called by shmem_mmap() or hugetlbfs_file_mmap() to disallow any future writable mappings of an memfd sealed this way. The F_SEAL_WRITE flag is not checked here, as that is handled via the mapping->i_mmap_writable mechanism and so any attempt at a mapping would fail before this could be run. However we intend to change this, meaning this check can be performed for F_SEAL_WRITE mappings also. The logic here is equally applicable to both flags, so update this function to accommodate both and rename it accordingly. Link: https://lkml.kernel.org/r/913628168ce6cce77df7d13a63970bae06a526e0.1697116581.git.lstoakes@gmail.com Signed-off-by: Lorenzo Stoakes Reviewed-by: Jan Kara Cc: Alexander Viro Cc: Andy Lutomirski Cc: Christian Brauner Cc: Hugh Dickins Cc: Matthew Wilcox (Oracle) Cc: Mike Kravetz Cc: Muchun Song Signed-off-by: Andrew Morton Cc: stable@vger.kernel.org Signed-off-by: Isaac J. Manjarres --- fs/hugetlbfs/inode.c | 2 +- include/linux/mm.h | 15 ++++++++------- mm/shmem.c | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 330729445d8a..d4b2a199cb9d 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -136,7 +136,7 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) vma->vm_flags |= VM_HUGETLB | VM_DONTEXPAND; vma->vm_ops = &hugetlb_vm_ops; - ret = seal_check_future_write(info->seals, vma); + ret = seal_check_write(info->seals, vma); if (ret) return ret; diff --git a/include/linux/mm.h b/include/linux/mm.h index b1509be77efb..fcd61558ebcb 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3526,25 +3526,26 @@ static inline void mem_dump_obj(void *object) {} #endif /** - * seal_check_future_write - Check for F_SEAL_FUTURE_WRITE flag and handle it + * seal_check_write - Check for F_SEAL_WRITE or F_SEAL_FUTURE_WRITE flags and + * handle them. * @seals: the seals to check * @vma: the vma to operate on * - * Check whether F_SEAL_FUTURE_WRITE is set; if so, do proper check/handling on - * the vma flags. Return 0 if check pass, or <0 for errors. + * Check whether F_SEAL_WRITE or F_SEAL_FUTURE_WRITE are set; if so, do proper + * check/handling on the vma flags. Return 0 if check pass, or <0 for errors. */ -static inline int seal_check_future_write(int seals, struct vm_area_struct *vma) +static inline int seal_check_write(int seals, struct vm_area_struct *vma) { - if (seals & F_SEAL_FUTURE_WRITE) { + if (seals & (F_SEAL_WRITE | F_SEAL_FUTURE_WRITE)) { /* * New PROT_WRITE and MAP_SHARED mmaps are not allowed when - * "future write" seal active. + * write seals are active. */ if ((vma->vm_flags & VM_SHARED) && (vma->vm_flags & VM_WRITE)) return -EPERM; /* - * Since an F_SEAL_FUTURE_WRITE sealed memfd can be mapped as + * Since an F_SEAL_[FUTURE_]WRITE sealed memfd can be mapped as * MAP_SHARED and read-only, take care to not allow mprotect to * revert protections on such mappings. Do this only for shared * mappings. For private mappings, don't need to mask diff --git a/mm/shmem.c b/mm/shmem.c index 2e6b7db7f14b..2034b9b3fb71 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2302,7 +2302,7 @@ static int shmem_mmap(struct file *file, struct vm_area_struct *vma) struct shmem_inode_info *info = SHMEM_I(file_inode(file)); int ret; - ret = seal_check_future_write(info->seals, vma); + ret = seal_check_write(info->seals, vma); if (ret) return ret; -- 2.50.1.552.g942d659e1b-goog