Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp4750235ybi; Tue, 30 Jul 2019 07:30:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqyaiGylp84MrKNEaGptFAWbulcN6e0O74foev+6wyEPi4027C0dkV+QLfjXEQAMqo45rLmF X-Received: by 2002:a17:902:8bc1:: with SMTP id r1mr66720178plo.42.1564497057983; Tue, 30 Jul 2019 07:30:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564497057; cv=none; d=google.com; s=arc-20160816; b=BVCZEYkmhWc2xvh4wNgxSyyzoMFZd7nBsWFNW3dwhaBbS/5zODYO14fyVCvT36BEs8 G8XHU0wbP+tS9G5PziN2nFpj5oluIantlmJZa6Jlcfj5OMJ4ErGueedkIJd7FJMVSy/m KCGDHVn/JZyYh5H4aAc3bgdSSHkndTnJoeC0VVKMqlQ+mqxh7URwc46WbZEKgrJG7AAh yPzJiwfYNCQ98hdUR4CvakaqxBhvBRim+8JX9q6WLsCJamHhGapra0i1VdGxBEXp4D2S vqPKF8cbAJvNvPTyYOALvoFpqpry18Ou3/UCftMLXKwBH7A+O4plqy2qLvo+1CvzdVcB 1MQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=dFIwBPW0rcThZhnLhm47Nufg0TXZYlCxUed6dZm0lE8=; b=b6EI145j5qwe75L2gWQT71TOfbnGgdbpdqg1ZEuLjjKCMnwpAyt1NENkVTdlblhbvq BynPVk0ukiWZ+l3lQMTz29Uh7tXGQX02uE3+aRdHejGy1jF1Bs09+JTrB9LzfBe7KzxZ RVzApc1sV71n4gg1T6f652NjqqB5VHg2NDaoUhMgyACrcz17AwZ1mkQPCjTnq6Qi2uL1 fhxrHjmVKhGxoFbaksdSALme+DT/AxAkObpmp4F4Or/ViqWgDKZ01dUe4TaVXgSsvxXR C97h5Ch9mIa8DF8XuhvgGbz7H8EBuUq5a8C24KZ/AuLq/puVzRp+Chczqf96OknsjUU9 o4TA== 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 v15si28881718pfm.238.2019.07.30.07.30.42; Tue, 30 Jul 2019 07:30:57 -0700 (PDT) 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 S1729543AbfG3HZc (ORCPT + 99 others); Tue, 30 Jul 2019 03:25:32 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:3245 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729355AbfG3HZb (ORCPT ); Tue, 30 Jul 2019 03:25:31 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id F12E1FD94DC2C1A68E11; Tue, 30 Jul 2019 15:25:29 +0800 (CST) Received: from huawei.com (10.175.124.28) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.439.0; Tue, 30 Jul 2019 15:25:22 +0800 From: Jason Yan To: , , , , , , , , CC: , , , , , , , Jason Yan Subject: [PATCH v2 00/10] implement KASLR for powerpc/fsl_booke/32 Date: Tue, 30 Jul 2019 15:42:15 +0800 Message-ID: <20190730074225.39544-1-yanaijie@huawei.com> X-Mailer: git-send-email 2.17.2 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.124.28] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This series implements KASLR for powerpc/fsl_booke/32, as a security feature that deters exploit attempts relying on knowledge of the location of kernel internals. Since CONFIG_RELOCATABLE has already supported, what we need to do is map or copy kernel to a proper place and relocate. Freescale Book-E parts expect lowmem to be mapped by fixed TLB entries(TLB1). The TLB1 entries are not suitable to map the kernel directly in a randomized region, so we chose to copy the kernel to a proper place and restart to relocate. Entropy is derived from the banner and timer base, which will change every build and boot. This not so much safe so additionally the bootloader may pass entropy via the /chosen/kaslr-seed node in device tree. We will use the first 512M of the low memory to randomize the kernel image. The memory will be split in 64M zones. We will use the lower 8 bit of the entropy to decide the index of the 64M zone. Then we chose a 16K aligned offset inside the 64M zone to put the kernel in. KERNELBASE |--> 64M <--| | | +---------------+ +----------------+---------------+ | |....| |kernel| | | +---------------+ +----------------+---------------+ | | |-----> offset <-----| kimage_vaddr We also check if we will overlap with some areas like the dtb area, the initrd area or the crashkernel area. If we cannot find a proper area, kaslr will be disabled and boot from the original kernel. Changes since v1: - Remove some useless 'extern' keyword. - Replace EXPORT_SYMBOL with EXPORT_SYMBOL_GPL - Improve some assembly code - Use memzero_explicit instead of memset - Use boot_command_line and remove early_command_line - Do not print kaslr offset if kaslr is disabled Jason Yan (10): powerpc: unify definition of M_IF_NEEDED powerpc: move memstart_addr and kernstart_addr to init-common.c powerpc: introduce kimage_vaddr to store the kernel base powerpc/fsl_booke/32: introduce create_tlb_entry() helper powerpc/fsl_booke/32: introduce reloc_kernel_entry() helper powerpc/fsl_booke/32: implement KASLR infrastructure powerpc/fsl_booke/32: randomize the kernel image offset powerpc/fsl_booke/kaslr: clear the original kernel if randomized powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter powerpc/fsl_booke/kaslr: dump out kernel offset information on panic arch/powerpc/Kconfig | 11 + arch/powerpc/include/asm/nohash/mmu-book3e.h | 10 + arch/powerpc/include/asm/page.h | 7 + arch/powerpc/kernel/Makefile | 1 + arch/powerpc/kernel/early_32.c | 2 +- arch/powerpc/kernel/exceptions-64e.S | 10 - arch/powerpc/kernel/fsl_booke_entry_mapping.S | 23 +- arch/powerpc/kernel/head_fsl_booke.S | 57 ++- arch/powerpc/kernel/kaslr_booke.c | 439 ++++++++++++++++++ arch/powerpc/kernel/machine_kexec.c | 1 + arch/powerpc/kernel/misc_64.S | 5 - arch/powerpc/kernel/setup-common.c | 19 + arch/powerpc/mm/init-common.c | 7 + arch/powerpc/mm/init_32.c | 5 - arch/powerpc/mm/init_64.c | 5 - arch/powerpc/mm/mmu_decl.h | 10 + arch/powerpc/mm/nohash/fsl_booke.c | 8 +- 17 files changed, 572 insertions(+), 48 deletions(-) create mode 100644 arch/powerpc/kernel/kaslr_booke.c -- 2.17.2