Received: by 2002:a25:b794:0:0:0:0:0 with SMTP id n20csp3421689ybh; Mon, 5 Aug 2019 18:31:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqw9cE89r3maGT3DApWgKK0Uq0I0yCjVKpUMKF8JBIk5Vx44DcCxtqSpUhSj3lFfjoVFOmDR X-Received: by 2002:a17:902:2f:: with SMTP id 44mr613019pla.5.1565055065215; Mon, 05 Aug 2019 18:31:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565055065; cv=none; d=google.com; s=arc-20160816; b=rg2+MyZRpXbNkoc0qCT5q7NbxJhzVL/W/eEebrjaEQhfJ9KG4ctv2wLOpleC8/wc9o lNtzdE1mFWWKO0zcblACulMj9YArXH8i+abEfj9sycgjNGhyO/ZLPpapUe5wsrAZG/aZ kFKJ1P1hRdeVUYlRxhEIWRLL/eCYuVFXyUowLv6frRYEYn4YUekvTJXL0sqFtmXx79i+ 7IvTKLD6UGcUEv7+Mf0o5Bc+FD13L2XDUvy3EK/9DsfKn8VQH9D6PYjHpLrKeeuZdkwO p5SZ9KzOhnBVaCM1+BhSgDgItzeGmXmM/yXoQPmbUWh/MybWTf26vCHd7hJRhvFBO79S QMuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=sJc2C2/Se/tXMYLIzCBspUOdudCtI3LiTG8bc9GhEZ0=; b=HIpRdXpOygWbGsovONqIeG+i9tX59FehgoXZWACrAM5fRaNH01xy/oSSKfkR5PdvTs ZZ75AZhzKioCKUNvujFmGCbmWqXy9QLMcwavkzoLZs3UAfR/kIGUmRdkmiHGLH/wlQRs jCp/VyzecN7mbBEDGDVLRpip01IdHXfjwGXlUx4fywWSzJo36OHuSm9ia3IDTqqnHqZy FEnDierpO7SXq2yCyO7DMP3cZyQ+hsIqekWveixKTyYqhdgjaWHs4lBn101qCK9coVce hEdlwEMeSAhuHFeCaTiuxSkYsTBq/zhUJPOzy56G83WUqWScQity3IWEJOQuDdzV4RxB Matw== 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 p19si12028615pgm.485.2019.08.05.18.30.49; Mon, 05 Aug 2019 18:31:05 -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 S1731256AbfHFBaJ (ORCPT + 99 others); Mon, 5 Aug 2019 21:30:09 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:3762 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728870AbfHFBaI (ORCPT ); Mon, 5 Aug 2019 21:30:08 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 05B3B1671C749B338C7C; Tue, 6 Aug 2019 09:30:07 +0800 (CST) Received: from [127.0.0.1] (10.177.96.203) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.439.0; Tue, 6 Aug 2019 09:29:59 +0800 Subject: Re: [PATCH v4 00/10] implement KASLR for powerpc/fsl_booke/32 To: , , , , , , , , CC: , , , , , , References: <20190805064335.19156-1-yanaijie@huawei.com> From: Jason Yan Message-ID: <50bc5134-231d-f518-07f9-41451361a7c3@huawei.com> Date: Tue, 6 Aug 2019 09:29:58 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 MIME-Version: 1.0 In-Reply-To: <20190805064335.19156-1-yanaijie@huawei.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.96.203] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Christophe , Can you take a look at patch 6,7,9 of this version? Thank you, Jason On 2019/8/5 14:43, Jason Yan wrote: > 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 v3: > - Add Reviewed-by and Tested-by tag from Diana > - Change the comment in fsl_booke_entry_mapping.S to be consistent > with the new code. > > 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 | 27 +- > 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, 560 insertions(+), 50 deletions(-) > create mode 100644 arch/powerpc/kernel/kaslr_booke.c >