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;
IronPort-SDR: Ksbh/r+izx9+37SDi+HMBOy6k0NKGzplRegrQV9Uls7n3BkERedMelUM25DhD/yc1rQbZFehG8
 X/jDop/aAiJGWViWEgXyKEBqiQ15XS0Xv8UJa7ZrdiJUZSaHV+OUx4CP37OZepvU4jQGELRF9N
 qWZLmRenehRNabwY9NlaCwWar88dNIxPh0bchMd5jp+0xUePD/7q2mqpxRct3kqv/wGRDwRR7b
 Har091RD4skCYVsyIRn+fQvTEyz3ZHBOQrevcBY13cVK5ZdxbY3Z3fi7xjoTnBJz1AUr24FT8p
 ecc=
From:   Anup Patel <Anup.Patel@wdc.com>
To:     Palmer Dabbelt <palmer@sifive.com>,
        Paul Walmsley <paul.walmsley@sifive.com>
CC:     Atish Patra <Atish.Patra@wdc.com>,
        Alistair Francis <Alistair.Francis@wdc.com>,
        Christoph Hellwig <hch@infradead.org>,
        Anup Patel <anup@brainfault.org>,
        "linux-riscv@lists.infradead.org" <linux-riscv@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Anup Patel <Anup.Patel@wdc.com>
Subject: [PATCH] RISC-V: Fix FIXMAP area corruption on RV32 systems
Thread-Topic: [PATCH] RISC-V: Fix FIXMAP area corruption on RV32 systems
Thread-Index: AQHVVCiwkrMhoC888UyZ9cBEv4GnHA==
Date:   Fri, 16 Aug 2019 11:49:40 +0000
Message-ID: <20190816114915.4648-1-anup.patel@wdc.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 2.17.1
x-originating-ip: [49.207.53.242]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: de585ded-84a1-4794-2f26-08d7223fd2a5
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:MN2PR04MB6237;
x-ms-traffictypediagnostic: MN2PR04MB6237:
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <MN2PR04MB6237BFECECD9813854E2D84F8DAF0@MN2PR04MB6237.namprd04.prod.outlook.com>
wdcipoutbound: EOP-TRUE
x-ms-oob-tlc-oobclassifiers: OLM:6430;
x-forefront-prvs: 0131D22242
x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(4636009)(366004)(396003)(346002)(376002)(39860400002)(136003)(189003)(199004)(4326008)(478600001)(86362001)(71190400001)(6512007)(71200400001)(66946007)(8936002)(3846002)(1076003)(316002)(50226002)(36756003)(44832011)(5660300002)(99286004)(476003)(2616005)(54906003)(110136005)(486006)(66066001)(25786009)(2906002)(52116002)(102836004)(6116002)(186003)(66556008)(6436002)(6506007)(55236004)(386003)(14454004)(7736002)(256004)(53936002)(305945005)(14444005)(8676002)(66476007)(6486002)(66446008)(26005)(81166006)(81156014)(64756008);DIR:OUT;SFP:1102;SCL:1;SRVR:MN2PR04MB6237;H:MN2PR04MB6061.namprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: P7Ktxgh2vIInarPYLbK2vRPxdoWYwNOXy4Crpl5MNk+t3/CUm9vwcqAW4LUnnN9qeFSkxPNufbBPifjTYIPmfU+iHi+GZIyKX7Z66Ehj9X73RkCXmPDboACuTYLxKBnlltHHxirMftbz9v2gBrJz/N2mM+64TFrob5XE8Ko6JvjPHr5uj16JJUAtiEWuYjq7S6uQ7bvCFWGkRbZDR2mVesl8BlYzRDlIzCEHsKYeHueBKpzNUmB0RU0X8+p+cOalPRC/nPH3ZZVavZQU1faEinn7t/FM5/DfNtXxHNm744XKQFU5ZCd7wviC/w436MZcpMZQQ9l8nKpmEHmleHW9c154dYT5lNZ9/HwXIshDRMOzR5n1xMVdxn3VcWmT42RXeVEE7DgfGXDFe1YBDPeG/CnhjcH57nD2r89fG6D+u4I=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-Network-Message-Id: de585ded-84a1-4794-2f26-08d7223fd2a5
X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Aug 2019 11:49:41.1097
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: XisOAn2WLe35yA79Heeks9H6uHH2nlVfxCS3QcgtXMw4cdmv2uXhsOIFCpkVDFcue+1HVUs4+4ZgPfbc7ieRug==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6237
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Currently, the order of various virtual memory areas in increasing
order of virtual addresses is as follows:
1. User space area
2. FIXMAP area
3. VMALLOC area
4. Kernel area

The user space area starts at 0x0 and it's maximum size is represented
by TASK_SIZE.

On RV32 systems, TASK_SIZE is defined as VMALLOC_START which causes the
user space area to overlap the FIXMAP area. This allows user space apps
to potentially corrupt the FIXMAP area and kernel OF APIs will crash
whenever they access corrupted FDT in the FIXMAP area.

On RV64 systems, TASK_SIZE is set to fixed 256GB and no other areas
happen to overlap so we don't see any FIXMAP area corruptions.

This patch fixes FIXMAP area corruption on RV32 systems by setting
TASK_SIZE to FIXADDR_START. We also move FIXADDR_TOP, FIXADDR_SIZE,
and FIXADDR_START defines to asm/pgtable.h so that we can avoid cyclic
header includes.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
---
 arch/riscv/include/asm/fixmap.h  |  4 ----
 arch/riscv/include/asm/pgtable.h | 12 ++++++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/arch/riscv/include/asm/fixmap.h b/arch/riscv/include/asm/fixma=
p.h
index 9c66033c3a54..161f28d04a07 100644
--- a/arch/riscv/include/asm/fixmap.h
+++ b/arch/riscv/include/asm/fixmap.h
@@ -30,10 +30,6 @@ enum fixed_addresses {
 	__end_of_fixed_addresses
 };
=20
-#define FIXADDR_SIZE		(__end_of_fixed_addresses * PAGE_SIZE)
-#define FIXADDR_TOP		(VMALLOC_START)
-#define FIXADDR_START		(FIXADDR_TOP - FIXADDR_SIZE)
-
 #define FIXMAP_PAGE_IO		PAGE_KERNEL
=20
 #define __early_set_fixmap	__set_fixmap
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgta=
ble.h
index a364aba23d55..9dd08a006a28 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -420,14 +420,22 @@ static inline void pgtable_cache_init(void)
 #define VMALLOC_END      (PAGE_OFFSET - 1)
 #define VMALLOC_START    (PAGE_OFFSET - VMALLOC_SIZE)
=20
+#define FIXADDR_TOP      (VMALLOC_START)
+#ifdef CONFIG_64BIT
+#define FIXADDR_SIZE     PMD_SIZE
+#else
+#define FIXADDR_SIZE     PGDIR_SIZE
+#endif
+#define FIXADDR_START    (FIXADDR_TOP - FIXADDR_SIZE)
+
 /*
- * Task size is 0x4000000000 for RV64 or 0xb800000 for RV32.
+ * Task size is 0x4000000000 for RV64 or 0x9fc00000 for RV32.
  * Note that PGDIR_SIZE must evenly divide TASK_SIZE.
  */
 #ifdef CONFIG_64BIT
 #define TASK_SIZE (PGDIR_SIZE * PTRS_PER_PGD / 2)
 #else
-#define TASK_SIZE VMALLOC_START
+#define TASK_SIZE FIXADDR_START
 #endif
=20
 #include <asm-generic/pgtable.h>
--=20
2.17.1