From patchwork Tue Oct 13 01:34:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 11834691 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A564316BC for ; Tue, 13 Oct 2020 01:34:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 66C032087E for ; Tue, 13 Oct 2020 01:34:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=arista.com header.i=@arista.com header.b="jh6Shp34" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 66C032087E Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=arista.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2105194000E; Mon, 12 Oct 2020 21:34:26 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0D5D394000A; Mon, 12 Oct 2020 21:34:26 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3EB894000D; Mon, 12 Oct 2020 21:34:25 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0117.hostedemail.com [216.40.44.117]) by kanga.kvack.org (Postfix) with ESMTP id B093294000A for ; Mon, 12 Oct 2020 21:34:25 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 528611EE6 for ; Tue, 13 Oct 2020 01:34:25 +0000 (UTC) X-FDA: 77365182090.17.debt53_3a04b80271ff Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 393D1180D0180 for ; Tue, 13 Oct 2020 01:34:25 +0000 (UTC) X-Spam-Summary: 1,0,0,49110d499938ca5b,d41d8cd98f00b204,dima@arista.com,,RULES_HIT:41:355:379:541:800:960:966:973:988:989:1260:1311:1314:1345:1359:1437:1515:1535:1543:1711:1730:1747:1777:1792:1801:2194:2196:2199:2200:2393:2553:2559:2562:2689:3138:3139:3140:3141:3142:3354:3865:3866:3867:3872:4118:4321:4385:4605:5007:6261:6653:6742:6743:7903:10004:11026:11473:11657:11658:11914:12043:12296:12297:12438:12517:12519:12555:12679:12895:12986:13894:14096:14181:14394:14721:21080:21220:21444:21451:21627:21987:21990:30029:30054:30090,0,RBL:209.85.221.65:@arista.com:.lbl8.mailshell.net-66.100.201.201 62.2.0.100;04y81gmomdbfr36gd1y6sc5rgtyxhocipysq5ik3gbnghupdh1i5e3ar3s8gf8c.qxaqhxudyb3qb9fdjwcz6i9bmr8ws5yz194rg5um9fpydm5rcjxit7jy3ze8wyj.1-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: debt53_3a04b80271ff X-Filterd-Recvd-Size: 7266 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Tue, 13 Oct 2020 01:34:24 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id e17so21806020wru.12 for ; Mon, 12 Oct 2020 18:34:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VQFsEpWuF4crrAFVUaO/CXC4VHrsA3+ZAZo85Yi/pU0=; b=jh6Shp34HrXFqwhbRrxN+YgzPDA8OoKF04HoFiyNjYZbVjAQaB03yWzpCRAqet1tBl qznQQVvt39gfc+rca19EffWNQulmC0gW4kOZ8oTyFIs115lHAaCkdHebfOmk4vwVJUR1 d2bQ9UoW57Nh9V9EzhGNzvekxXH9NTWdA1QVVsRmgMdO4ONwKofcPq8xEzaBF3S4R5jg jdusZLNIDiReYRlgKGWx6Z/UqIV8WzrGb6kyLnbpUec/Bapgh5SfttlYv6fPecZcoanq byDqDGINOzYslI8U3EIjdSphlS2zzm6PJPCEHPm660qZ4fQUqAT8u67Dx5YXCG+X9fLu uI9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VQFsEpWuF4crrAFVUaO/CXC4VHrsA3+ZAZo85Yi/pU0=; b=frtbwDHYlQafgQFunrBp4It1oX/8MJpZWOQLPEl5v0qH63Fm019Is4xbApq8y/dFKI fOmAR9FDNbAC0YlVEbExxjHjKnYwe9zxhZk7P6t6v/9wX83wtb61LhigCVod3jiP/C8A 9bn07aundN+0YWq1R39TsM3p4ShySdHQZ4/3KttEgDAPJuzDyjhyk1czK6/vV8LcmOw5 o86fj1KcRYMuIAhViqw1R/fWtYSD04e6Qv+KH9ca3BCgbWYrDOQtg/CHfkIW09WGi6p7 Hj/rPOhdJ/MOFrA1ndSKVjHQE6t15PNG3i8R1S/MtVGLpYB1D34hSaealAJOsPW02KCT wgcg== X-Gm-Message-State: AOAM531pJwEPEFkXdU0NyxaoIG1RyE+db7fYp0iJp87v0CZgH5azA84Q jCa9opzysOZ6Z+bIP8R5S+PT6A== X-Google-Smtp-Source: ABdhPJw5vKLkrkjcJCNIMOOzrKmqWdjiE3iZi/mIzmQ8aAHgnoINflz5eE8APWdVPpZyrKnFlUqGEw== X-Received: by 2002:adf:e881:: with SMTP id d1mr21447682wrm.395.1602552863641; Mon, 12 Oct 2020 18:34:23 -0700 (PDT) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id d23sm24825325wmb.6.2020.10.12.18.34.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 18:34:23 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Alexander Viro , Andrew Morton , Andy Lutomirski , Brian Geffon , Catalin Marinas , Dan Williams , Dave Jiang , Hugh Dickins , Ingo Molnar , "Kirill A. Shutemov" , Mike Kravetz , Minchan Kim , Russell King , Thomas Bogendoerfer , Thomas Gleixner , Vishal Verma , Vlastimil Babka , Will Deacon , linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 3/6] mremap: Don't allow MREMAP_DONTUNMAP on special_mappings and aio Date: Tue, 13 Oct 2020 02:34:13 +0100 Message-Id: <20201013013416.390574-4-dima@arista.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201013013416.390574-1-dima@arista.com> References: <20201013013416.390574-1-dima@arista.com> MIME-Version: 1.0 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: As kernel expect to see only one of such mappings, any further operations on the VMA-copy may be unexpected by the kernel. Maybe it's being on the safe side, but there doesn't seem to be any expected use-case for this, so restrict it now. Fixes: commit e346b3813067 ("mm/mremap: add MREMAP_DONTUNMAP to mremap()") Signed-off-by: Dmitry Safonov --- arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- fs/aio.c | 5 ++++- include/linux/mm.h | 2 +- mm/mmap.c | 6 +++++- mm/mremap.c | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c index 0daf2f1cf7a8..e916646adc69 100644 --- a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c +++ b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c @@ -1458,7 +1458,7 @@ static int pseudo_lock_dev_release(struct inode *inode, struct file *filp) return 0; } -static int pseudo_lock_dev_mremap(struct vm_area_struct *area) +static int pseudo_lock_dev_mremap(struct vm_area_struct *area, unsigned long flags) { /* Not supported */ return -EINVAL; diff --git a/fs/aio.c b/fs/aio.c index d5ec30385566..3be3c0f77548 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -324,13 +324,16 @@ static void aio_free_ring(struct kioctx *ctx) } } -static int aio_ring_mremap(struct vm_area_struct *vma) +static int aio_ring_mremap(struct vm_area_struct *vma, unsigned long flags) { struct file *file = vma->vm_file; struct mm_struct *mm = vma->vm_mm; struct kioctx_table *table; int i, res = -EINVAL; + if (flags & MREMAP_DONTUNMAP) + return -EINVAL; + spin_lock(&mm->ioctx_lock); rcu_read_lock(); table = rcu_dereference(mm->ioctx_table); diff --git a/include/linux/mm.h b/include/linux/mm.h index 16b799a0522c..fd51a4a1f722 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -550,7 +550,7 @@ struct vm_operations_struct { void (*open)(struct vm_area_struct * area); void (*close)(struct vm_area_struct * area); int (*split)(struct vm_area_struct * area, unsigned long addr); - int (*mremap)(struct vm_area_struct * area); + int (*mremap)(struct vm_area_struct *area, unsigned long flags); vm_fault_t (*fault)(struct vm_fault *vmf); vm_fault_t (*huge_fault)(struct vm_fault *vmf, enum page_entry_size pe_size); diff --git a/mm/mmap.c b/mm/mmap.c index bdd19f5b994e..50f853b0ec39 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3372,10 +3372,14 @@ static const char *special_mapping_name(struct vm_area_struct *vma) return ((struct vm_special_mapping *)vma->vm_private_data)->name; } -static int special_mapping_mremap(struct vm_area_struct *new_vma) +static int special_mapping_mremap(struct vm_area_struct *new_vma, + unsigned long flags) { struct vm_special_mapping *sm = new_vma->vm_private_data; + if (flags & MREMAP_DONTUNMAP) + return -EINVAL; + if (WARN_ON_ONCE(current->mm != new_vma->vm_mm)) return -EFAULT; diff --git a/mm/mremap.c b/mm/mremap.c index c248f9a52125..898e9818ba6d 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -384,7 +384,7 @@ static unsigned long move_vma(struct vm_area_struct *vma, if (moved_len < old_len) { err = -ENOMEM; } else if (vma->vm_ops && vma->vm_ops->mremap) { - err = vma->vm_ops->mremap(new_vma); + err = vma->vm_ops->mremap(new_vma, flags); } if (unlikely(err)) {