From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3374234-1523481184-2-2059770011803807917 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523481183; b=KuT5ktteve/whJgm4lqIOixUf1FyIqsRJm6KZwuwdJQMgGNB8m JvHwercpSJ4M2yAn0g2Nv1qAmolMfsdXgYke1nZv8EFQiJWmq7EYovoSNiYsqGxg B5YivYCKDrEgrhOYa1+bKRW8MdTpOZYXV4HWpG1qAkZVD/HVXNJwPLPweDN7Fvv3 8V8+eOVkneMrtcNDY7+ubCGx5eUtEOQj59TuY+P2sgFaupPXwKP9LtTlDFVym+8J V2QgPQmDSKpa5L2CY1xKJC3/KFPAf2LsJi6wzpZkMglTYk/o8S9+f0iE7w9BGP6x sU+MWBtE6HqH3ncZju31+F0Zpmyqb8cfbjZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523481183; bh=Pqfchmk/7KWFpyTHB8qOUSMY5TKLpB D7hzdxoYxiPMc=; b=u7ZpFfGmCgmVMW7TWMtvmidTGOG5PwQRDA+yzLTO3Ro2D8 seAWS5Tlxjks8QiGRCE2MRCdc+2lQ0DS1IV6Zw18/jj5Y12YHei9WyB2N9vcn6j8 LLjMm1o8KfaxHRgwTwET6gvth8V8iFoFrZDwUx2VGFi70G7qgjoiR/d7G9be2VSD kCk7Pu57DSgRkhRMkTdT6BcyeENC/VY2H/VcerjhVD8R+F7iAXTHNIevrCYG6nuv ajLIqfVgnzubypxVOAwZeVnfi92lAq/hpoKhJ9JI8C5j/+VoZkIrPRm6U6sqyCYy N4D8hGNiSaDO92YM1eKyNDKPICvF92X5B9RoQDTQ== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfOBemTbgCBLHeZP47oDS8EEHuqw+ngz4y7DrLMjOriaBabIFGpECJovOqfdhwXKdg03YZ9tgb9s2ikjPS7NpJDeWFB0pRGWpW4zB8ROvwMo6paiMAKcC Z7LFB47AkekXXRRhuoT/4tVyr7g/5u+Y1phTvxDrgsn8mfoRVTd57qW2Vo2jKTDE12KVixsZ5CauSrHZq8iRHQVrR7yAGP6J8MavbQnwry93YDf9xHJq8sba X-CM-Analysis: v=2.3 cv=JLoVTfCb c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=r_1tXGB3AAAA:8 a=WPyIoOwQAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=72xZbA8UcqOln83T7vIA:9 a=uqzMzFlEHLVlSoyi:21 a=SHoKzRpxr37DTnWa:21 a=QEXdDO2ut3YA:10 a=t8nPyN_e6usw4ciXM-Pk:22 a=S-HzPIwwDS8t1QcwSuWs:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753899AbeDKVMs (ORCPT ); Wed, 11 Apr 2018 17:12:48 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:56764 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754799AbeDKSlS (ORCPT ); Wed, 11 Apr 2018 14:41:18 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marcin Nowakowski , linux-mips@linux-mips.org, Ralf Baechle , Sasha Levin Subject: [PATCH 3.18 077/121] MIPS: mm: fixed mappings: correct initialisation Date: Wed, 11 Apr 2018 20:36:20 +0200 Message-Id: <20180411183500.857530871@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183456.195010921@linuxfoundation.org> References: <20180411183456.195010921@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marcin Nowakowski [ Upstream commit 71eb989ab5a110df8bcbb9609bacde73feacbedd ] fixrange_init operates at PMD-granularity and expects the addresses to be PMD-size aligned, but currently that might not be the case for PKMAP_BASE unless it is defined properly, so ensure a correct alignment is used before passing the address to fixrange_init. fixed mappings: only align the start address that is passed to fixrange_init rather than the value before adding the size, as we may end up with uninitialised upper part of the range. Signed-off-by: Marcin Nowakowski Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/15948/ Signed-off-by: Ralf Baechle Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/mips/mm/pgtable-32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/arch/mips/mm/pgtable-32.c +++ b/arch/mips/mm/pgtable-32.c @@ -51,15 +51,15 @@ void __init pagetable_init(void) /* * Fixed mappings: */ - vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK; - fixrange_init(vaddr, vaddr + FIXADDR_SIZE, pgd_base); + vaddr = __fix_to_virt(__end_of_fixed_addresses - 1); + fixrange_init(vaddr & PMD_MASK, vaddr + FIXADDR_SIZE, pgd_base); #ifdef CONFIG_HIGHMEM /* * Permanent kmaps: */ vaddr = PKMAP_BASE; - fixrange_init(vaddr, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base); + fixrange_init(vaddr & PMD_MASK, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base); pgd = swapper_pg_dir + __pgd_offset(vaddr); pud = pud_offset(pgd, vaddr);