From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757904AbcBIQKi (ORCPT ); Tue, 9 Feb 2016 11:10:38 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38491 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757610AbcBIQKd (ORCPT ); Tue, 9 Feb 2016 11:10:33 -0500 Date: Tue, 9 Feb 2016 08:09:54 -0800 From: tip-bot for Matthew Wilcox Message-ID: Cc: keescook@chromium.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, luto@amacapital.net, peterz@infradead.org, willy@linux.intel.com, luto@kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, akpm@linux-foundation.org Reply-To: luto@kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, akpm@linux-foundation.org, keescook@chromium.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, luto@amacapital.net, willy@linux.intel.com, peterz@infradead.org In-Reply-To: <1453742717-10326-2-git-send-email-matthew.r.wilcox@intel.com> References: <1453742717-10326-2-git-send-email-matthew.r.wilcox@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/mm: Honour passed pgprot in track_pfn_insert() and track_pfn_remap() Git-Commit-ID: dd7b6847670a84b7bb7c38f8e69b2f12059bca66 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: dd7b6847670a84b7bb7c38f8e69b2f12059bca66 Gitweb: http://git.kernel.org/tip/dd7b6847670a84b7bb7c38f8e69b2f12059bca66 Author: Matthew Wilcox AuthorDate: Mon, 25 Jan 2016 12:25:15 -0500 Committer: Ingo Molnar CommitDate: Tue, 9 Feb 2016 15:25:36 +0100 x86/mm: Honour passed pgprot in track_pfn_insert() and track_pfn_remap() track_pfn_insert() overwrites the pgprot that is passed in with a value based on the VMA's page_prot. This is a problem for people trying to do clever things with the new vm_insert_pfn_prot() as it will simply overwrite the passed protection flags. If we use the current value of the pgprot as the base, then it will behave as people are expecting. Also fix track_pfn_remap() in the same way. Signed-off-by: Matthew Wilcox Acked-by: Andy Lutomirski Cc: Andrew Morton Cc: Andy Lutomirski Cc: Kees Cook Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/1453742717-10326-2-git-send-email-matthew.r.wilcox@intel.com Signed-off-by: Ingo Molnar --- arch/x86/mm/pat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index f4ae536..04e2e71 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c @@ -943,7 +943,7 @@ int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, return -EINVAL; } - *prot = __pgprot((pgprot_val(vma->vm_page_prot) & (~_PAGE_CACHE_MASK)) | + *prot = __pgprot((pgprot_val(*prot) & (~_PAGE_CACHE_MASK)) | cachemode2protval(pcm)); return 0; @@ -959,7 +959,7 @@ int track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot, /* Set prot based on lookup */ pcm = lookup_memtype(pfn_t_to_phys(pfn)); - *prot = __pgprot((pgprot_val(vma->vm_page_prot) & (~_PAGE_CACHE_MASK)) | + *prot = __pgprot((pgprot_val(*prot) & (~_PAGE_CACHE_MASK)) | cachemode2protval(pcm)); return 0;