Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp5850024imu; Wed, 30 Jan 2019 04:45:46 -0800 (PST) X-Google-Smtp-Source: ALg8bN52R3WWebmWOGKEo/QfL6QTlF0Yfc/0KRYWdhtrwSccrlvzKgapqAdFOumR4lk5q6f42EjC X-Received: by 2002:a62:30c3:: with SMTP id w186mr30518080pfw.39.1548852346780; Wed, 30 Jan 2019 04:45:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548852346; cv=none; d=google.com; s=arc-20160816; b=zgGfinLfdzttT3KnYQlXf2WxQkowO0rX+qLNL3qRXACeVrSkyaynDoiaKLNSzaNUXn OWSXTuoOfpaxH+HojJDcHt6Q4NUxefWZyFsGuZUjsObmLAgMo82kLlVpKZsUcyaGeNyY DMav2FOME1x4L2XtvySV8bWUxq98Svs3dXOnw1g6CUtw3gvwwl+JwOA+doK1/s+XugjA E5enaf9cPh+KekbE9B66XSD3MXygLNNwojnPIy4lRxO/sHhv/lW05HUWQRRK6FLuwhKm YxmnoeSAj5+afspnZl4t7qcvjSsNIxA/iLyNEBENKX1tTdt45pDwOCkJqwBEoueP2wKc G+Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=n9EewSWBpIrjWW0Ewb2hQwGri96Bkj/XJ3FPiJDZfXg=; b=Hg9PYuBMkshI8VD+Vr4i3rO2ZkuHXPJKQrO9kz9hhWm9NjMEeRYI4nu+Pxda3dH8+r dCmfmaEaXSx/SwGrBLAq+x3KYdXPqvgoSAymJgDiToy2ucuhBBU8CR/ZK9wKCR5DHPf1 MHTj6LAsJKgqMZRjWqfmcDi3ESTnXqfLL9LnywgGsrg1Pzm9gUhrtcRzjgYZ2uz4KzQ5 brnxD9YtMhjbtZ2atBIo9TKn1Qbzcrm2AOgA+3mNCz/sFN7+hBqUf5Xbj4eeymWU1uq1 5au7+v3AI2Y9OjJiO2oWGuNy16Mzo7OefixRlP5re37/LKyYT2gFdYnQ4R8VPkeBQP5L eEmA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j7si1576225plb.91.2019.01.30.04.45.31; Wed, 30 Jan 2019 04:45:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730861AbfA3MpP (ORCPT + 99 others); Wed, 30 Jan 2019 07:45:15 -0500 Received: from mx2.suse.de ([195.135.220.15]:41376 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727457AbfA3MpO (ORCPT ); Wed, 30 Jan 2019 07:45:14 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 4CEA0B020; Wed, 30 Jan 2019 12:45:13 +0000 (UTC) From: Vlastimil Babka To: Andrew Morton , Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-api@vger.kernel.org, Peter Zijlstra , Greg KH , Jann Horn , Jiri Kosina , Dominique Martinet , Andy Lutomirski , Dave Chinner , Kevin Easton , Matthew Wilcox , Cyril Hrubis , Tejun Heo , "Kirill A . Shutemov" , Daniel Gruss , Vlastimil Babka , Jiri Kosina Subject: [PATCH 1/3] mm/mincore: make mincore() more conservative Date: Wed, 30 Jan 2019 13:44:18 +0100 Message-Id: <20190130124420.1834-2-vbabka@suse.cz> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190130124420.1834-1-vbabka@suse.cz> References: <20190130124420.1834-1-vbabka@suse.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Kosina The semantics of what mincore() considers to be resident is not completely clear, but Linux has always (since 2.3.52, which is when mincore() was initially done) treated it as "page is available in page cache". That's potentially a problem, as that [in]directly exposes meta-information about pagecache / memory mapping state even about memory not strictly belonging to the process executing the syscall, opening possibilities for sidechannel attacks. Change the semantics of mincore() so that it only reveals pagecache information for non-anonymous mappings that belog to files that the calling process could (if it tried to) successfully open for writing. Originally-by: Linus Torvalds Originally-by: Dominique Martinet Cc: Dominique Martinet Cc: Andy Lutomirski Cc: Dave Chinner Cc: Kevin Easton Cc: Matthew Wilcox Cc: Cyril Hrubis Cc: Tejun Heo Cc: Kirill A. Shutemov Cc: Daniel Gruss Signed-off-by: Jiri Kosina Signed-off-by: Vlastimil Babka --- mm/mincore.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mm/mincore.c b/mm/mincore.c index 218099b5ed31..747a4907a3ac 100644 --- a/mm/mincore.c +++ b/mm/mincore.c @@ -169,6 +169,14 @@ static int mincore_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, return 0; } +static inline bool can_do_mincore(struct vm_area_struct *vma) +{ + return vma_is_anonymous(vma) || + (vma->vm_file && + (inode_owner_or_capable(file_inode(vma->vm_file)) + || inode_permission(file_inode(vma->vm_file), MAY_WRITE) == 0)); +} + /* * Do a chunk of "sys_mincore()". We've already checked * all the arguments, we hold the mmap semaphore: we should @@ -189,8 +197,13 @@ static long do_mincore(unsigned long addr, unsigned long pages, unsigned char *v vma = find_vma(current->mm, addr); if (!vma || addr < vma->vm_start) return -ENOMEM; - mincore_walk.mm = vma->vm_mm; end = min(vma->vm_end, addr + (pages << PAGE_SHIFT)); + if (!can_do_mincore(vma)) { + unsigned long pages = (end - addr) >> PAGE_SHIFT; + memset(vec, 1, pages); + return pages; + } + mincore_walk.mm = vma->vm_mm; err = walk_page_range(addr, end, &mincore_walk); if (err < 0) return err; -- 2.20.1