From patchwork Sun Apr 30 22:26:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13227329 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 23539C77B60 for ; Sun, 30 Apr 2023 22:26:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 520746B0074; Sun, 30 Apr 2023 18:26:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D1046B0075; Sun, 30 Apr 2023 18:26:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2ADD26B0078; Sun, 30 Apr 2023 18:26:46 -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 19EE26B0074 for ; Sun, 30 Apr 2023 18:26:46 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E0E24C06E3 for ; Sun, 30 Apr 2023 22:26:45 +0000 (UTC) X-FDA: 80739493170.06.506531B Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by imf10.hostedemail.com (Postfix) with ESMTP id 10A3BC0009 for ; Sun, 30 Apr 2023 22:26:43 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=gsFUOW0Y; spf=pass (imf10.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682893604; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Yb73uisocFKIniSChsToEe21gb62ZyaVkxC6mK3mItE=; b=tSdkyzFodPooHhLNlLtyBieEck13Au9Q5ET3OK7HDH6qwexNy6bcJFQidYYnjaPRNlpHEx iFsu+LIYYFwoVVl7hoGqSHP3He6W4N9OW+1AMRJ3GZXN1q1mtod9BQhZMEpNCbm7sdPo7G EM7t+E1JuO1EsSrhvgsgq9E8b/NjV6A= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=gsFUOW0Y; spf=pass (imf10.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682893604; a=rsa-sha256; cv=none; b=6qbEL9sRK0I9ybfAaWHTvRvNUqbax7CeviEtfRBO9o7d0AbpFbZv86VGhtQB5A0r+9Px8+ yLar2lmufWXcUaXMjmukUQgbaQziwTY4yyLUX6kN/NC8WTQQ029twMdW4l2+anmJi3x3bU pHym+MYR47xqvScuSTeGtfy8dJOUcRQ= Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-3010889c6ebso1055947f8f.2 for ; Sun, 30 Apr 2023 15:26:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682893602; x=1685485602; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Yb73uisocFKIniSChsToEe21gb62ZyaVkxC6mK3mItE=; b=gsFUOW0Y9mVkXYV4t1E3PZo4X+N6fp7jxDS8tKbqlcgdlkmj2YG0RghKtdWI4BHcOn xmp8KAt5xli9RCnbEdUVxSSUWCGjy24PH09/PdiiJh7jpjCgPLpX2EhIJuaszKUJClIO yUPl5VmCgoUzeb6EVEGupAsJVFpMsZGFY8XhBfz7ERKU5+CTzb/dsrItI8T4HkBJZvd3 jglAD7KNqidPxalMHaS4SSmu+1+R2DLYIOztB9CPpdBc4DkwwKFLL1a/QyUKGiikRpE0 z8rsTAmdz1M0ur6TcRjjdsphLB3CeA9C+VoFBwIAfT4upypl8VdTAVrSyVvooMoXErfV /n0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682893602; x=1685485602; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Yb73uisocFKIniSChsToEe21gb62ZyaVkxC6mK3mItE=; b=bQkmNcsHebGwcr6D3KHOONS727mToEcZ0u7p2Mkx/qs/GCrHZvK/DWIOTTR5Q31LpU JmoNu8RJ2vcMVjvTn54tyZKR+9KaQUaW8ATMxCq7aXofYmpzEgud6liEg8LAxhNIrY6C zopV1WiNJr0/jGwBS3HiM+zKEhx/08Lq8hmxX6ncohypHf3+bBdTeNxA6qnHreL9s3bj IgYQAOCqSsWZWUJUhmV/XSK6kFPKt6NY8ymp22gPK3MU5loo8DqpUIxPMPc4J8lbYm22 0Q0lPDepREo7iljb8sA5WaQk41gc9RFgYPhyaRiPrrmbQGaMOOBfrD5JkSH0U6+eG+n0 1f0w== X-Gm-Message-State: AC+VfDwBI7gWalxlfzSzetnK86Q1QYa4ak0RYgpTuhN7oikiVQ5vw5TW gbKK/kqWQb0uB/RHMA2WoPqHQ9uXJpDckw== X-Google-Smtp-Source: ACHHUZ57BxNNYDj7zctg3JHwhr5cvQ58P7G8J8BYjVMfhqIVRLA7nj5p4p4AxNhjquz50+Pn+mUt6A== X-Received: by 2002:a5d:40c4:0:b0:306:2b1a:101d with SMTP id b4-20020a5d40c4000000b003062b1a101dmr2146028wrq.12.1682893602232; Sun, 30 Apr 2023 15:26:42 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id g2-20020a5d5402000000b002da75c5e143sm26699865wrv.29.2023.04.30.15.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Apr 2023 15:26:41 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: Matthew Wilcox , Mike Kravetz , Muchun Song , Alexander Viro , Christian Brauner , Andy Lutomirski , linux-fsdevel@vger.kernel.org, Jan Kara , Hugh Dickins , Lorenzo Stoakes Subject: [PATCH v2 1/3] mm: drop the assumption that VM_SHARED always implies writable Date: Sun, 30 Apr 2023 23:26:05 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 10A3BC0009 X-Rspam-User: X-Stat-Signature: 6w3oh6mp46bnjtb7agkqpfxfupqud5x7 X-HE-Tag: 1682893603-6820 X-HE-Meta: U2FsdGVkX18sfLIxNhkLWgvpKpFDx4eOiaCntCMbTTPAtfYWzucY5tw+Bu3WlcAssudPMy8zgFqBGYxpXQ8bQ4/MPuoOZqV+OXPbce3aY1lBtkIhfDJMN5CT4B6c9f0s3UZkusL1O18v7feFRjbUzUBwXD+ek8T2ut5A0gkc/N837X2LjOxreFk5dVkfC8UeWECX66mDQ9DpGIDawMqEMOtoZS+EoAx8qDEX5txeH8/iCW1pqK+C2C/MQ15ZtaX8u4wk3/UXUPbCuFnL0ABF6grHH5IVFFVzPL1YJnkNwhyEjJ9pMSfTficB8IDYmn+/BrMC0eheIidhej1J9vL8k17YfKTJ9b0FdPf2Am4+t1qFqlFnUaiVhNeQ8OQ6lkUYgySFK0u0FWRSPGaG8YvLczRKw9ufxIWm/ykW66FeZuu+61bv/paJVyMOKukvSmBK52RvL0z2/W4WqA/0O9RDLAu/zKDnLVgQA6tBwZ07qJXXYFLZznKm6loXYZan2S7L0AtFRmVQ9E/RRYSstvmJLLz9oS9twPvGiPkWaD1TrFmUe5yI87We7JtemEHIgeT1oFa8c2CjnK3rOLr64o6FQOA/+mjUchzgIUqyxixt6FIuxSQ9I5PL77R8569TKDCLBJvTM7honSXtJA+uJnhrDOxuUGSpGa0Y8eT0D83eFuVCUxRpVRFuldYTN8l4OQSWaGBRoJsscQpEre3SCKKBtXNJCPvUSOWCtHf1Tyf+D/jIiNfu+QWk713ZiCNCd+2qmCJ+gEXBXP6lG8NS6NKI+r6nixY3+sYbOujn+TvkGzL5NB3gWnlc0JME+bLiUnxRtmOgCGn0i5Fbyg1h5Qly1KpBVa6qvNJKXa67Z8p3CUb796+D1xt1gQGDp+Y5ibBKeTKMXvaZ7GVI38b1AdOUqXoPbIHz2DgOiXvCYn7IB7o/sx56jXptJHiWF9FHKIjBS9uai1fG1JXptryySmo +5xoiq51 roPH8B3xVsDT3qz8FqciHVK3L6SOBcBP0ffHlMRVbdQTxXDTiyUw77ZQ3k7uvbS9tj34SUnN0eWSTJHW2pzvuMlJ1sRc/cd+PZOFA6Q3iTCfutA22tesdAD49BOeHV5bjN6nR7uym7b+dtVTutnTbi3sXlZGq40tTr1aU4MXgyCRX/bZcIVaDUT2ubtU0BQGxpEbOW0Pq0lCfcbog3UmR38MzLM22JK060dJnithDTdHiE1o50sWPH34w7GRr1odQBq8Qc6fVcOKIUFW8PdNc43CpHEP+i9IQCaQnaXkFqLTltfbqHuO+i+pSgfkQjCBFUghO6C2wzCQ/EmRGDZssBxzR3dfDXieEdWElJoO+ze7Dn061oBRPZDMLG35yYB0v1SBBnR44jN/tLkV0l4+KHrEfcy1d7tjYgEXE8TGvmNGv5KHCVyCl++q+ldFaIdvAtOQP11iRHquSHVUNvFi0wNMxVimZR5tKj+OTL22Ipq9GijAVWbKh4mxx2TfKB8H1/5VPvSdcWapzzjlghRX64pSSgqo0qTLomZzI 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: There are places in the kernel where there is an implicit assumption that VM_SHARED VMAs must either be writable or might become writable via e.g. mprotect(). We can explicitly check for the writable, shared case while remaining conservative - If VM_MAYWRITE is not set then, by definition, the memory can never be written to. Update these checks to also check for VM_MAYWRITE. Suggested-by: Andy Lutomirski Signed-off-by: Lorenzo Stoakes --- include/linux/fs.h | 4 ++-- include/linux/mm.h | 11 +++++++++++ kernel/fork.c | 2 +- mm/filemap.c | 2 +- mm/madvise.c | 2 +- mm/mmap.c | 12 ++++++------ 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 67495ef79bb2..874fe0e38e65 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -413,7 +413,7 @@ extern const struct address_space_operations empty_aops; * It is also used to block modification of page cache contents through * memory mappings. * @gfp_mask: Memory allocation flags to use for allocating pages. - * @i_mmap_writable: Number of VM_SHARED mappings. + * @i_mmap_writable: Number of VM_SHARED, VM_MAYWRITE mappings. * @nr_thps: Number of THPs in the pagecache (non-shmem only). * @i_mmap: Tree of private and shared mappings. * @i_mmap_rwsem: Protects @i_mmap and @i_mmap_writable. @@ -516,7 +516,7 @@ static inline int mapping_mapped(struct address_space *mapping) /* * Might pages of this file have been modified in userspace? - * Note that i_mmap_writable counts all VM_SHARED vmas: do_mmap + * Note that i_mmap_writable counts all VM_SHARED, VM_MAYWRITE vmas: do_mmap * marks vma as VM_SHARED if it is shared, and the file was opened for * writing i.e. vma may be mprotected writable even if now readonly. * diff --git a/include/linux/mm.h b/include/linux/mm.h index 27ce77080c79..3e8fb4601520 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -851,6 +851,17 @@ static inline bool vma_is_accessible(struct vm_area_struct *vma) return vma->vm_flags & VM_ACCESS_FLAGS; } +static inline bool is_shared_maywrite(vm_flags_t vm_flags) +{ + return (vm_flags & (VM_SHARED | VM_MAYWRITE)) == + (VM_SHARED | VM_MAYWRITE); +} + +static inline bool vma_is_shared_maywrite(struct vm_area_struct *vma) +{ + return is_shared_maywrite(vma->vm_flags); +} + static inline struct vm_area_struct *vma_find(struct vma_iterator *vmi, unsigned long max) { diff --git a/kernel/fork.c b/kernel/fork.c index 4342200d5e2b..7ebd6229219a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -733,7 +733,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, get_file(file); i_mmap_lock_write(mapping); - if (tmp->vm_flags & VM_SHARED) + if (vma_is_shared_maywrite(tmp)) mapping_allow_writable(mapping); flush_dcache_mmap_lock(mapping); /* insert tmp into the share list, just after mpnt */ diff --git a/mm/filemap.c b/mm/filemap.c index a34abfe8c654..4d896515032c 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3607,7 +3607,7 @@ int generic_file_mmap(struct file *file, struct vm_area_struct *vma) */ int generic_file_readonly_mmap(struct file *file, struct vm_area_struct *vma) { - if ((vma->vm_flags & VM_SHARED) && (vma->vm_flags & VM_MAYWRITE)) + if (vma_is_shared_maywrite(vma)) return -EINVAL; return generic_file_mmap(file, vma); } diff --git a/mm/madvise.c b/mm/madvise.c index b5ffbaf616f5..5eb59854e285 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -969,7 +969,7 @@ static long madvise_remove(struct vm_area_struct *vma, return -EINVAL; } - if ((vma->vm_flags & (VM_SHARED|VM_WRITE)) != (VM_SHARED|VM_WRITE)) + if (!vma_is_shared_maywrite(vma)) return -EACCES; offset = (loff_t)(start - vma->vm_start) diff --git a/mm/mmap.c b/mm/mmap.c index 5522130ae606..646e34e95a37 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -107,7 +107,7 @@ void vma_set_page_prot(struct vm_area_struct *vma) static void __remove_shared_vm_struct(struct vm_area_struct *vma, struct file *file, struct address_space *mapping) { - if (vma->vm_flags & VM_SHARED) + if (vma_is_shared_maywrite(vma)) mapping_unmap_writable(mapping); flush_dcache_mmap_lock(mapping); @@ -428,7 +428,7 @@ static unsigned long count_vma_pages_range(struct mm_struct *mm, static void __vma_link_file(struct vm_area_struct *vma, struct address_space *mapping) { - if (vma->vm_flags & VM_SHARED) + if (vma_is_shared_maywrite(vma)) mapping_allow_writable(mapping); flush_dcache_mmap_lock(mapping); @@ -2642,7 +2642,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, vma->vm_pgoff = pgoff; if (file) { - if (vm_flags & VM_SHARED) { + if (is_shared_maywrite(vm_flags)) { error = mapping_map_writable(file->f_mapping); if (error) goto free_vma; @@ -2717,7 +2717,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, vma_iter_store(&vmi, vma); mm->map_count++; if (vma->vm_file) { - if (vma->vm_flags & VM_SHARED) + if (vma_is_shared_maywrite(vma)) mapping_allow_writable(vma->vm_file->f_mapping); flush_dcache_mmap_lock(vma->vm_file->f_mapping); @@ -2734,7 +2734,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, /* Once vma denies write, undo our temporary denial count */ unmap_writable: - if (file && vm_flags & VM_SHARED) + if (file && is_shared_maywrite(vm_flags)) mapping_unmap_writable(file->f_mapping); file = vma->vm_file; ksm_add_vma(vma); @@ -2781,7 +2781,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, unmap_region(mm, &mm->mm_mt, vma, prev, next, vma->vm_start, vma->vm_end, true); } - if (file && (vm_flags & VM_SHARED)) + if (file && is_shared_maywrite(vm_flags)) mapping_unmap_writable(file->f_mapping); free_vma: vm_area_free(vma); From patchwork Sun Apr 30 22:26:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13227330 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 3E35EC77B7F for ; Sun, 30 Apr 2023 22:26:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 066E86B0075; Sun, 30 Apr 2023 18:26:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F31A16B0078; Sun, 30 Apr 2023 18:26:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF82C6B007B; Sun, 30 Apr 2023 18:26:47 -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 D0B136B0075 for ; Sun, 30 Apr 2023 18:26:47 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A3A55AD7F8 for ; Sun, 30 Apr 2023 22:26:47 +0000 (UTC) X-FDA: 80739493254.30.B41A423 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by imf08.hostedemail.com (Postfix) with ESMTP id C10AC160009 for ; Sun, 30 Apr 2023 22:26:45 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ZcBxn6CM; spf=pass (imf08.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682893605; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=StL9gTHBRtlU2jg4ZVDsgmTWUDVZUlKWf2f0xPKhTn0=; b=qtUiCRVY8Aw/vL81CN2Dm4OpQOizr/AmozrVc3ZONTPsNTzP5xvzynIcRtJqUDpkufLMsN kotiCNHv7p1ahbWnPicO3c4V0kUs/cR7vtY3R5YLBuwoKNB9dTl3EYWHAko9ok+ZFmWZbb 8cQ/ROYOmEN0gRjYR0A7Sb/h5pS9pko= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ZcBxn6CM; spf=pass (imf08.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682893605; a=rsa-sha256; cv=none; b=cdBLurCAhOUoYQcoyxBcZoDU9d3sfYjpfs8t0ah4GqhnZZ8ht+aJzLsg+W6N0JGqrI5bKn v1R7p/DG9JAv7rfODAQDmn0U5V01QPCyInUUEL5lv/f+h890VkE7PZHtwdVjLoUR3e0eHa TXrJoYHgnhSvWmR9QmGnaFMEDfLw93A= Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-3f182d745deso18296785e9.0 for ; Sun, 30 Apr 2023 15:26:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682893604; x=1685485604; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=StL9gTHBRtlU2jg4ZVDsgmTWUDVZUlKWf2f0xPKhTn0=; b=ZcBxn6CMjkdRm3nAQ39aBrgfJnBCb2bk30AmyalhJaUZtdYVYnfTR3+98YhxpbN0eq RhTd1LpgdoOLfHl3SkLCbW7yxPFGD2l0KZ7Z8lVMcb4ZkVNEU1QNvBEgwbxyAbaxfMKH tpKRISMTfXnczaBlzoVFBY+pjpmTJtB8J4v4SY2rv3erOLl/9kjRPNqAaxgedAdAx1ku QN290yBGpErHD0+GTxFLoO8Q190ngSHAqAfvDOCH4Iimp7xnEuxN9Tb9USlwV8WebZdW LHZmdGFVFmpPfQeowB54q52OQkDgFSZxYBxn1CQiruoKRKnD0SXq+P7FupuvI70mxFqd vVBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682893604; x=1685485604; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=StL9gTHBRtlU2jg4ZVDsgmTWUDVZUlKWf2f0xPKhTn0=; b=iPBJiexQ1IdOjSVBLgkNpkFRG0aLcbQWGcNxnyRs34U7+rByuzhbEiIbGeDrMdD7FL l1ZB4/gcEvW14mb3jAT/jZgkCM2h99Y/0UFim7K3B+BHJ+TutUYQvHp5Blj4uect4SZb U/Nt/FylKf7bbxhbozw3fAe85AjSVbK2KAtuY9y9gPAvHxdoWp/VdPhcCahnsT5vOYQO ZHNwIX5asb8JDFVsYEhFFTN+cXwlvlW37mgoBmXrsaldgc2u0s3x9qmoc8ejR4yDCLOI 5SQYuRbbBhssWSA2gZuoKLr8BPZvTF8IRlJwz881CZ+RC8xdImgJYJZFxmszDzEcIW9C EyDA== X-Gm-Message-State: AC+VfDyAEq9wyruksknGmQD4xKMSX3+E+YpsVqCp58oHRgsMoqXo+m0v LU6XQuiA9oTQcb9JvEJJSPaZHVm77spvIw== X-Google-Smtp-Source: ACHHUZ7+gOevXvXP/Vlp1ptLgrITWEfEUgVen2T7segNDbKUOuNGRaU+00ZCQHHi69rin2TjB/K1Jw== X-Received: by 2002:adf:f484:0:b0:2f8:c94c:3895 with SMTP id l4-20020adff484000000b002f8c94c3895mr9214182wro.23.1682893603897; Sun, 30 Apr 2023 15:26:43 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id g2-20020a5d5402000000b002da75c5e143sm26699865wrv.29.2023.04.30.15.26.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Apr 2023 15:26:43 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: Matthew Wilcox , Mike Kravetz , Muchun Song , Alexander Viro , Christian Brauner , Andy Lutomirski , linux-fsdevel@vger.kernel.org, Jan Kara , Hugh Dickins , Lorenzo Stoakes Subject: [PATCH v2 2/3] mm: update seal_check_[future_]write() to include F_SEAL_WRITE as well Date: Sun, 30 Apr 2023 23:26:06 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 1ybytwi1dcfxet3pz9dxuqohqcwbwbnp X-Rspamd-Queue-Id: C10AC160009 X-HE-Tag: 1682893605-289261 X-HE-Meta: U2FsdGVkX1+/06dffwAvJHTkqRshq7IBbsM8HyjssnFOAX53BW+2E10TL8DUCToWjRF81YbSFpgdYkg6LHw0PRuDJUvx0m76Vj6kA2OaDKlZgR5v2/FOOMn3OZLi5aL0xzFGMoYUrmlNaZNE1IJYxF/mH3K3YCZLpDTFw0r+BEcAPMibOUj+sEjpqa3qajofjOLPMLAslOLwLKRigy0eYgqYsvb1bUmOeZvwvT+6cubRUIckFPwJa9qFX7bIntcL5p7fQLKORGZUrw7zu+Q30b4LYJs/NnSUI+tWJGcgk4kzQrVNvo4VISFJ0GS10F3OL3WFOKf6jg0Z60o42HNbzYR7y8/jTSiqf1sS5LWGWvc9lSFeOC0vOLQKVvcAj7rXhYs1kWrQptwjLOeXkIL3czcyMZQwl6KQ/MDAcLa5Js370PYwE/3br5J0EgAn7saFuMWFxaptXmnyKWmDkGntyeYqVLTgPv2So5DTk+pNCSEx9Jh/42GUmA2yxgcFdzSUEhFq+m/NBaXUKHEfqiMBq6CEPSkq6Uv5nOd5H/xcBVCbCQ1CUjZkbJ1dv0l/MIhm/3ahBG8Y60P57y+DGvZkh5+i4NhHdfINX24o6ZyVqKvvo3KUz5fPY/JL97GmN0azZDUTENNDt5o1F6g4Q4ffsw7MJYBBBINEhLFtLEo/Z4ToY+p08rRwZ65bRnHAidcQItzuoNwU+t8WduoLX0MAFSqBT6ugeR1rgEJR2+a7SF7M+pApc4om3utThpUyD9ET9+T7cwgfovrqUtkGCy90rV/VhTQNISsMZ5/zTc5Hf7jEtnXHQLnoUApszZUJ7/a4VQfJizFW/sjD/Z8UN38uuiX+9cDwA0jdsqJ1YoRxvUHz9xEEd0WLwGM/spj8jwKEPnS/BtvzcvlHp5SygnxMDJ5AYLDBRzbVHYL4MSxNjwAGaMsuNwo1XE189ri70QADaUfOe59dqmGTommxWOi yk/sDSiS V0N98q+YiDpxiFBI9muntFy3LrVvGB8xr1lt6/6NsWXVfIeud0x76hRLrM5VEj1j5+ChZWnhyw/G7dyUSuyuCZx7+YdJEhl/ydFDz062gkJb4v7mNJ1/+ginMAg5EIhQ80xhQl56vIKOrsWh2I62O4GGi92WYqJdxoZ9nAGd2twI+JlW0RfdeZYtP9NUdEF69P9ecUWAEqESiYm34qxiggBQKmBjt5kkAzduQiyk9HuY474JcisTzDY/YdzFM9/M5pZUh7amku4CckzAiGWaQrgvY3QOv9c4YpWrrpBakEXX8qO4P2YEDyGzFHkubblGUPuSPAoJz4zTYzQjcx8Z/XVzIF4WEbO1Qn4sn2RMajTi03jsME2CJ6PNBPMDX90l/VPhVXdOcv6mopeJFHRDkFsFxwDPbmMp2D0Ke7MkARZpyuw7O2d+2xkRSfuRfci6reVl9RSR9xOAIVXxc3vQIKMg0TnRdkYBdEKj3 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: Check for F_SEAL_WRITE as well for which the precise same logic can reasonably be applied, however so far this code will simply not be run as the mapping_map_writable() call occurs before shmem_mmap() or hugetlbfs_file_mmap() and thus would error out in the case of a read-only shared mapping before the logic could be applied. This therefore has no impact until the following patch which changes the order in which the *_mmap() functions are called. Signed-off-by: Lorenzo Stoakes --- fs/hugetlbfs/inode.c | 2 +- include/linux/mm.h | 13 +++++++------ mm/shmem.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index ecfdfb2529a3..4abe3d4a6d1c 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -135,7 +135,7 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) vm_flags_set(vma, 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 3e8fb4601520..6bf63ee1b769 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3784,16 +3784,17 @@ 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 flag and + * handle it. * @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. @@ -3802,7 +3803,7 @@ static inline int seal_check_future_write(int seals, struct vm_area_struct *vma) 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 e517ab50afd9..c54df8e36bc1 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2325,7 +2325,7 @@ static int shmem_mmap(struct file *file, struct vm_area_struct *vma) struct shmem_inode_info *info = SHMEM_I(inode); int ret; - ret = seal_check_future_write(info->seals, vma); + ret = seal_check_write(info->seals, vma); if (ret) return ret; From patchwork Sun Apr 30 22:26:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13227331 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 C75E7C77B73 for ; Sun, 30 Apr 2023 22:26:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1502F6B0078; Sun, 30 Apr 2023 18:26:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1006E6B007B; Sun, 30 Apr 2023 18:26:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE38B6B007D; Sun, 30 Apr 2023 18:26:48 -0400 (EDT) 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 E0E3E6B0078 for ; Sun, 30 Apr 2023 18:26:48 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id AF5CFAD7EE for ; Sun, 30 Apr 2023 22:26:48 +0000 (UTC) X-FDA: 80739493296.28.727E88E Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by imf17.hostedemail.com (Postfix) with ESMTP id E31E84000E for ; Sun, 30 Apr 2023 22:26:46 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=VXNNdRhL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682893607; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gU5klj4JuCtxBh6JR6WjnJXM2yce7ELIzVSpcWZL9RY=; b=yHPOThmfd2D8TtZRCnpDrveZremX6nlm2R0lY6/NaDe4+HC+ZbL7WQ5MC4SCSJs0DWVYSy FCAlojmJWFKjrkZb12jL4CK08m7djYy2tmC5ER+zQ1zjJh6JgXqP50MnD5kTley9PKwy8A xbM+XptBwttaG/x1KQSsiOMQo8r6SZw= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=VXNNdRhL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682893607; a=rsa-sha256; cv=none; b=2DHoGhDc0ZTpKNX2PxpnvYfODiJ8CUWkTq/1VpAkMbhKqD771DhochjKZQgpsc4IhLGdbe 8giXeGo4kqtPEi00KPRsbnflNG9o1uidGNUN/zRIalnYB4psyGNLvflqD8a+s1OBnLB42d V/vLW1nKvu9VjApe2JLLwobizzjsa8Y= Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-2f27a9c7970so1733065f8f.2 for ; Sun, 30 Apr 2023 15:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682893605; x=1685485605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gU5klj4JuCtxBh6JR6WjnJXM2yce7ELIzVSpcWZL9RY=; b=VXNNdRhLqJDygRRWBenMw/2sboDt9lMxswc9Klc7vyZ7DUUY8PsRrW4VYJXOKcH18t qlCJf2sRfxtVrN7OzpZbclacR5lQtGV6yIVIuJ2NYAMZlpbayLltwRM8D6ieUfN6+jkC FjJMWW2TRyK4N4hEBJ0pllZrGFeL40h545zok0J472IxJ/QO7vIlbUB716nHnopqBlYT AU9clybB/l7GCTu17p2ip6WlBxT18xR8ZMTJtAAINBnTkPXLceuKXkyumwE13HR/zkw0 FQBZimSmFtGej5L5shtV9NLrlZgp5R7ELWLyd7VcsucF2yrHASTmMy4DhE48LvmZWGDv Hfpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682893605; x=1685485605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gU5klj4JuCtxBh6JR6WjnJXM2yce7ELIzVSpcWZL9RY=; b=cjtoH7A4lUAqtEvdXrSGIjM7sj0xcJuL+WaYvGir5MM1k+tYBjyNVolfjYFCPF+Uq4 r3GP818+Kzp29vnzaH+QJWx8/PFyTOHyqErhWpM3x7L2W3xBy59xzw27MgNkCVwFMx/g VgBEr04J7MwVoleAnf89e6P+f89jqUHv6lSozh3B3eBtxQwc+TfFygt+WiKBafuVBDEY Plz9l+Ibc/UcwDyZJUJEwSYEh1SnvJZCa0e6ZrYC+L3vTIuf4e4oq7XcQNjbn/X+P5jV qKsGRPn/U4e3qDkN4vFRhh/ejt72bP04wLQlamSWoBeShpeAiD1FGaMT4dJYcdG9FThj KD9A== X-Gm-Message-State: AC+VfDz/KBpRow46cFcbKtwljD7a/4rjVRS5EftJQQ0kfB5iKfUhNEGS B564KC4R+clY7QtU5Nld22pYY3CZVvq/dQ== X-Google-Smtp-Source: ACHHUZ5v8qXYw3hgXK16jHy+ni2ikKLOkyTRyqZ3qFWlrvR4D0x5Vzd2irHeayWjLHt2m0/NfaYC3w== X-Received: by 2002:adf:db8e:0:b0:2fe:f2d1:dcab with SMTP id u14-20020adfdb8e000000b002fef2d1dcabmr8764207wri.58.1682893605108; Sun, 30 Apr 2023 15:26:45 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id g2-20020a5d5402000000b002da75c5e143sm26699865wrv.29.2023.04.30.15.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Apr 2023 15:26:44 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: Matthew Wilcox , Mike Kravetz , Muchun Song , Alexander Viro , Christian Brauner , Andy Lutomirski , linux-fsdevel@vger.kernel.org, Jan Kara , Hugh Dickins , Lorenzo Stoakes Subject: [PATCH v2 3/3] mm: perform the mapping_map_writable() check after call_mmap() Date: Sun, 30 Apr 2023 23:26:07 +0100 Message-Id: <6f3aea05c9cc46094b029cbd1138d163c1ae7f9d.1682890156.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: E31E84000E X-Stat-Signature: oy6mcr3xtgwszgddxohydrn1z3c4qtpd X-HE-Tag: 1682893606-965816 X-HE-Meta: U2FsdGVkX1/8RNhQMeFodblYQpwOXUvQvoY6ode92hUrL4M1dck+tThEfAOEayeRnpSQvYOJQpDM8t7eSVQGqIIS0TkqSzMxcN2a/l9I1mR0Utllz8eOBKQgu1KcSAXPf6VMUCOSur69h2AYbrvJYtWu2/Gx0+HdyKUK7rUgPdYEDmBCo3v2tktd0ZAEUL7Fh0pczjXXCnSd2+Lky1DxP6RZ4vxtp8OkRtH2AH/wpyMQW61UD7OWmLVQVwx8gIo6gzm7I7qHN/XbxOxdiHs+FyG/E2i1Rfn6B67HNPkKm1j4Qb2fCM7sj6eQiVZm4ozEcc0tkDfpiEWaVx0R0Ih0WrcJDkDdQJrWzbXHf4tAORDNF72p8n2nsO2CTform6vWQTyUYfSpllm71K+qI7h2HbUdOyTJahXVQIIuS7fRjrenqPh8TuWI3QV7LBzFqCrVeE3GTqWs7fUJbagkCEoe0nq2Kuq7ikTtP+klv5S0KJ762oo3STWWiaUDDyBP2Y+EM4LzEX9KTv/q5hmzvrFCYPucCgq98eAsElKDHaGsxfubDuuOEdfw3YkE1meK1+9BDaukAw5AgEocRpPuSJ5eXoerK5grq5l4mtqSvT1A46/wQDBJUXjZ9AmXd74c25f5Hou+d4ctE/EwVOunPNgwnjBQNEKpjQv3N4zGkvLOMRUT3jOVX4YCp2YkDpO9kGRJ2QMXdmc+Nd9y3pjQHvyJFtNivtSjAhGIUVUBqclfmNlJ7+RCuxE0KQfJNnhwsC2t737Y8AqzHFFb41de6hfcRTQkcJuAMFcH4MyfcedhEqVZiKw92nSw5PljJ3lPw21IkBJwTQlsgQJpb7rzq7X+MuCeJmRYb5AK88pk00AqEqeBIxCfL+61/A1SC2Wr6YYxVuCT+x8b3aq0N1iZydWwfFnQ0tiTtbMTQ3dMNc2kVLfuItMZJZ6F3x6h/FI7U/bd1EpHfX9ZcXLn2JQIGjk AVPCr2gp 81f8uNseXQLdST5bh3qjz2vOT4NAIfbK2/1kbTFa1YFDUVnr0cXEPAmhQJ60AoOCdMPCPAVtq814IS71pA9unMAz4qfwZEJwNDLjJS9GZ/6rhhRkbwe5I78maEqqi44fESvsJ8F8QZVWBOnwKjttue2IvRq3NQb1noexI7oJKQH+iMfsUw2r4hwsJpXMrS6cIwQyuJ6BPvJlf/IT815fyjgfd8AoUrXoKKX5clNYX9txeN3QCTRRL28dv8ohp7L3XMAwpVgjlUuv7GxiAIe1J8oNAtEznQ+wkS9EwNnuoA4wz55fXfIp6FFwyb7tCWW+9at64moPrjld/5HqWyB3T8i9dj//VadDbo22MGxtuizz1zHphPYeavM5hnGZjugJgdd6TJhaO4/xANFL0fBoiwHef8lcDfrqZNjrpFNzNETag4nSYsmNsyWlKRle+ar6EwCSPTQiYch+raxksBM23SzFM6AUgThLU6cm+2R4pKhuNMK8x6zR/RZDxj8ChLWJV7SGVWTA7Uh9T4mppgtNtMXVSxCuqMpJxlI9r 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: In order for a F_SEAL_WRITE sealed memfd mapping to have an opportunity to clear VM_MAYWRITE, we must be able to invoke the appropriate vm_ops->mmap() handler to do so. We would otherwise fail the mapping_map_writable() check before we had the opportunity to avoid it. This patch moves this check after the call_mmap() invocation. Only memfd actively denies write access causing a potential failure here (in memfd_add_seals()), so there should be no impact on non-memfd cases. This patch makes the userland-visible change that MAP_SHARED, PROT_READ mappings of an F_SEAL_WRITE sealed memfd mapping will now succeed. Link: https://bugzilla.kernel.org/show_bug.cgi?id=217238 Signed-off-by: Lorenzo Stoakes --- mm/mmap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.40.1 diff --git a/mm/mmap.c b/mm/mmap.c index 646e34e95a37..1608d7f5a293 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2642,17 +2642,17 @@ unsigned long mmap_region(struct file *file, unsigned long addr, vma->vm_pgoff = pgoff; if (file) { - if (is_shared_maywrite(vm_flags)) { - error = mapping_map_writable(file->f_mapping); - if (error) - goto free_vma; - } - vma->vm_file = get_file(file); error = call_mmap(file, vma); if (error) goto unmap_and_free_vma; + if (vma_is_shared_maywrite(vma)) { + error = mapping_map_writable(file->f_mapping); + if (error) + goto close_and_free_vma; + } + /* * Expansion is handled above, merging is handled below. * Drivers should not alter the address of the VMA.