Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp5788982ybi; Wed, 31 Jul 2019 03:22:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqywrEvR/LASDHGgzdTcVQwb6rSxuwYUm/2A8nmXdvF0zVfvyt6vfSzVYDq85vyw7hJuAmcp X-Received: by 2002:a17:902:8490:: with SMTP id c16mr122321161plo.1.1564568541743; Wed, 31 Jul 2019 03:22:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564568541; cv=none; d=google.com; s=arc-20160816; b=Md3jFq2VcBh1XdLA2HiYidGaG6hYV/Vew6hGvpkvyJxZ/bh8eIpKXiLDxhvCDtx2We V5tUwKi87BvaidkEnOcDwSHPr3MVKISREWtJaAIH5pcbYPPFnWMrV0YvksvV+Zp0DPjH bFRd0xNitcsWw7xNkpNlwscNag4Z51/jlx+1TI82DAASXQWUriY8dgdLDd5IeNEUCDjF IIp+ZSjU7jT9iMivvydtqkrdqLTaaSI/anz3ZQRobATWVlD/ssrnka6Wcc5bxbxUTjiU hjEz22dTL/wwpLdKkCeDgKev9N4D2ZZVV73le7kJEZe+2ohTjdmnjsjC1J7Fl8rqHwYF MsVA== 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=4p/67Or69ab3FPqyrFul1lmcfLFvgTkfInj7FTXkWiw=; b=gnOrHOeRHcJIzvKovKgrPKv4bAoiytk6D1Aa2eWIz9FJeYT/udr4OUd6+DAX/3tFZj bpIErrwV1/ZFUZzTxNAy3pFJtnN7Fkt87gRsqZwFWc8ouj1iQmyQvpdu7Xx1wYZfy69f IPwQBtMlZZV4dcqXqMvVzvSGpcUFdbtugGmknjxTIKF7vR5m569P7pp6FvDxMuDqPR2V ktEh0jZrkOyuwbC0XBEYwQRtmsaPPyqJ8b6rP5QMqVl8qFj6ufIZoZELb9oTYdjfhEmg qIW3+SYgsB3yZMAqOROWGyFcLxgYXn5Y+lt1vLc57/Cem9WSEcd8kYKEtsdCAi560mxp bAZQ== 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 91si30246263ply.196.2019.07.31.03.22.06; Wed, 31 Jul 2019 03:22:21 -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 S1728698AbfGaJ0V (ORCPT + 99 others); Wed, 31 Jul 2019 05:26:21 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:3266 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725209AbfGaJ0U (ORCPT ); Wed, 31 Jul 2019 05:26:20 -0400 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 781061536A38834C328B; Wed, 31 Jul 2019 17:26:18 +0800 (CST) Received: from huawei.com (10.175.124.28) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.439.0; Wed, 31 Jul 2019 17:26:08 +0800 From: Jason Yan To: , , , , , , , , CC: , , , , , , , Jason Yan Subject: [PATCH v3 00/10] implement KASLR for powerpc/fsl_booke/32 Date: Wed, 31 Jul 2019 17:43:08 +0800 Message-ID: <20190731094318.26538-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 v2: - Remove unnecessary #ifdef - Use SZ_64M instead of0x4000000 - Call early_init_dt_scan_chosen() to init boot_command_line - Rename kaslr_second_init() to kaslr_late_init() 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 | 55 ++- arch/powerpc/kernel/kaslr_booke.c | 427 ++++++++++++++++++ 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, 558 insertions(+), 48 deletions(-) create mode 100644 arch/powerpc/kernel/kaslr_booke.c -- 2.17.2