From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5527FC7618B for ; Mon, 29 Jul 2019 14:05:01 +0000 (UTC) Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.kernel.org (Postfix) with SMTP id B3260216C8 for ; Mon, 29 Jul 2019 14:05:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3260216C8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kernel-hardening-return-16614-kernel-hardening=archiver.kernel.org@lists.openwall.com Received: (qmail 7629 invoked by uid 550); 29 Jul 2019 14:04:54 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Received: (qmail 7595 invoked from network); 29 Jul 2019 14:04:53 -0000 Subject: Re: [RFC PATCH 09/10] powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter To: Christophe Leroy , , , , , , , , CC: , , , , , References: <20190717080621.40424-1-yanaijie@huawei.com> <20190717080621.40424-10-yanaijie@huawei.com> From: Jason Yan Message-ID: <846fa5fc-5d21-d974-e021-c314b554fa51@huawei.com> Date: Mon, 29 Jul 2019 22:04:31 +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: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.177.96.203] X-CFilter-Loop: Reflected On 2019/7/29 19:38, Christophe Leroy wrote: > > > Le 17/07/2019 à 10:06, Jason Yan a écrit : >> One may want to disable kaslr when boot, so provide a cmdline parameter >> 'nokaslr' to support this. >> >> Signed-off-by: Jason Yan >> Cc: Diana Craciun >> Cc: Michael Ellerman >> Cc: Christophe Leroy >> Cc: Benjamin Herrenschmidt >> Cc: Paul Mackerras >> Cc: Nicholas Piggin >> Cc: Kees Cook >> --- >>   arch/powerpc/kernel/kaslr_booke.c | 14 ++++++++++++++ >>   1 file changed, 14 insertions(+) >> >> diff --git a/arch/powerpc/kernel/kaslr_booke.c >> b/arch/powerpc/kernel/kaslr_booke.c >> index 00339c05879f..e65a5d9d2ff1 100644 >> --- a/arch/powerpc/kernel/kaslr_booke.c >> +++ b/arch/powerpc/kernel/kaslr_booke.c >> @@ -373,6 +373,18 @@ static unsigned long __init >> kaslr_choose_location(void *dt_ptr, phys_addr_t size >>       return kaslr_offset; >>   } >> +static inline __init bool kaslr_disabled(void) >> +{ >> +    char *str; >> + >> +    str = strstr(early_command_line, "nokaslr"); > > Why using early_command_line instead of boot_command_line ? > Will switch to boot_command_line. > >> +    if ((str == early_command_line) || >> +        (str > early_command_line && *(str - 1) == ' ')) > > Is that stuff really needed ? > > Why not just: > > return strstr(early_command_line, "nokaslr") != NULL; > This code is derived from other arch such as arm64/mips. It's trying to make sure that 'nokaslr' is a separate word but not part of other words such as 'abcnokaslr'. >> +        return true; >> + >> +    return false; >> +} > > >> + >>   /* >>    * To see if we need to relocate the kernel to a random offset >>    * void *dt_ptr - address of the device tree >> @@ -388,6 +400,8 @@ notrace void __init kaslr_early_init(void *dt_ptr, >> phys_addr_t size) >>       kernel_sz = (unsigned long)_end - KERNELBASE; >>       kaslr_get_cmdline(dt_ptr); >> +    if (kaslr_disabled()) >> +        return; >>       offset = kaslr_choose_location(dt_ptr, size, kernel_sz); >> > > Christophe > > . > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11EC4C433FF for ; Mon, 29 Jul 2019 14:08:42 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 474522070D for ; Mon, 29 Jul 2019 14:08:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 474522070D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 45y1kZ5jyBzDqDm for ; Tue, 30 Jul 2019 00:08:38 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=huawei.com (client-ip=45.249.212.191; helo=huawei.com; envelope-from=yanaijie@huawei.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from huawei.com (szxga05-in.huawei.com [45.249.212.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 45y1f904wFzDqDX for ; Tue, 30 Jul 2019 00:04:44 +1000 (AEST) Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id CCB4D861A3D54308FD35; Mon, 29 Jul 2019 22:04:41 +0800 (CST) Received: from [127.0.0.1] (10.177.96.203) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.439.0; Mon, 29 Jul 2019 22:04:32 +0800 Subject: Re: [RFC PATCH 09/10] powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter To: Christophe Leroy , , , , , , , , References: <20190717080621.40424-1-yanaijie@huawei.com> <20190717080621.40424-10-yanaijie@huawei.com> From: Jason Yan Message-ID: <846fa5fc-5d21-d974-e021-c314b554fa51@huawei.com> Date: Mon, 29 Jul 2019 22:04:31 +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: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.177.96.203] X-CFilter-Loop: Reflected X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wangkefeng.wang@huawei.com, linux-kernel@vger.kernel.org, jingxiangfeng@huawei.com, thunder.leizhen@huawei.com, fanchengyang@huawei.com, yebin10@huawei.com Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On 2019/7/29 19:38, Christophe Leroy wrote: > > > Le 17/07/2019 à 10:06, Jason Yan a écrit : >> One may want to disable kaslr when boot, so provide a cmdline parameter >> 'nokaslr' to support this. >> >> Signed-off-by: Jason Yan >> Cc: Diana Craciun >> Cc: Michael Ellerman >> Cc: Christophe Leroy >> Cc: Benjamin Herrenschmidt >> Cc: Paul Mackerras >> Cc: Nicholas Piggin >> Cc: Kees Cook >> --- >>   arch/powerpc/kernel/kaslr_booke.c | 14 ++++++++++++++ >>   1 file changed, 14 insertions(+) >> >> diff --git a/arch/powerpc/kernel/kaslr_booke.c >> b/arch/powerpc/kernel/kaslr_booke.c >> index 00339c05879f..e65a5d9d2ff1 100644 >> --- a/arch/powerpc/kernel/kaslr_booke.c >> +++ b/arch/powerpc/kernel/kaslr_booke.c >> @@ -373,6 +373,18 @@ static unsigned long __init >> kaslr_choose_location(void *dt_ptr, phys_addr_t size >>       return kaslr_offset; >>   } >> +static inline __init bool kaslr_disabled(void) >> +{ >> +    char *str; >> + >> +    str = strstr(early_command_line, "nokaslr"); > > Why using early_command_line instead of boot_command_line ? > Will switch to boot_command_line. > >> +    if ((str == early_command_line) || >> +        (str > early_command_line && *(str - 1) == ' ')) > > Is that stuff really needed ? > > Why not just: > > return strstr(early_command_line, "nokaslr") != NULL; > This code is derived from other arch such as arm64/mips. It's trying to make sure that 'nokaslr' is a separate word but not part of other words such as 'abcnokaslr'. >> +        return true; >> + >> +    return false; >> +} > > >> + >>   /* >>    * To see if we need to relocate the kernel to a random offset >>    * void *dt_ptr - address of the device tree >> @@ -388,6 +400,8 @@ notrace void __init kaslr_early_init(void *dt_ptr, >> phys_addr_t size) >>       kernel_sz = (unsigned long)_end - KERNELBASE; >>       kaslr_get_cmdline(dt_ptr); >> +    if (kaslr_disabled()) >> +        return; >>       offset = kaslr_choose_location(dt_ptr, size, kernel_sz); >> > > Christophe > > . >