From patchwork Thu Jul 21 10:04:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Bulwahn X-Patchwork-Id: 12924950 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8A16FC433EF for ; Thu, 21 Jul 2022 10:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=BTZMbE6EkDsT+VaQIgWmSjrJ7de9GjwcA3QJTMApYwY=; b=D4zy1OHIox37T4 M7HAJoiwj8V8IDpw7dXR9fhK3a4PKk/QVZylkigv1YWWOsHaJlCqgoXvNdrgsg2NSUS3R8cb9t6DM b5C9jkWlvlUZI8N+uWwsP4ceqMVk1vnGjx1NVGDGoGpXoCxdo3YlodsNZRhjHcgaKQzRm0hLhP/5z tqaWagOr3YnHE9rzjlkFLUA7/+uuYgL9D3OAGoYD0/9u0VAYPKYiO9wdsMcwBc5gqL37GXuG4YV7U 7e0AKxbwmVkIkJg2Rbl7jv0L4adQ2BTva1duDUBN5GgyTGvH+aWHaVMqAzL/YvKCgJryBLxLLRYp+ HpH344IesszLg2EpLkOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oET6J-003gkC-Mu; Thu, 21 Jul 2022 10:08:12 +0000 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oET33-003eKM-Ir for linux-arm-kernel@lists.infradead.org; Thu, 21 Jul 2022 10:04:50 +0000 Received: by mail-ej1-x632.google.com with SMTP id mf4so2314332ejc.3 for ; Thu, 21 Jul 2022 03:04:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=OmiME2WjuBaxraPUdAySd/nUD3D7/qmdyLuktPj9ZJY=; b=GFCfEGC9t+Rf8CxbPXrlDDDL7mAzykWfdZPlI+fBTNr+n5dMUjsf+tuC24l4EUTRQV uYZxZMIUnKZ/dYK3Ys4b321ivYvsrZY8mdP7ERI/6fNcxjKxT85hVvUPIf9ofBm/imUR lLMrICWUCs04Kbu9tvpI3CGz23i3O1fwyikYJaYhalXGpIGwndbd+mISslCl2GAGS529 oT4DDCkVyqe+s0EOcYDc/8xg8mCwsyjW2usVFuUiZBa+C1AJDGovrqcQlGvjiYu/aTdi NQtkB352wwNcOH7Df9yYjD+qq17DItb4Zcq3UJL0EvV99y/VciaFhTTVSEZJWLADepqT xtBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=OmiME2WjuBaxraPUdAySd/nUD3D7/qmdyLuktPj9ZJY=; b=mnjniUvItL9QMZ6hZwk+WgaVdd1oMDgM58g11pBekEJO5IlG1jn15Axy9w/5KZhFXL nh8HXqmQERiGmFGyjHcB/cCZrFAkYO/LHdnXOq5Ol/imrZinf2AmKqQSKWeLQDEvU6HG GAtjsBYtb5R2MpnQ+utDIypTfA27rVAFVnQhxTga8nyDc5Q+n4bMc6Ov3BwjzR85v+2I VAQhQraSgSvsloYcqWX1ShXqUs1OalZVUcMkIbnunkBVWeK+LP/ieLBiNQuAc2COs0f8 wMHYm6AntFRLzGap6yKr9CBFQOv0FJ5OTIKgH+KZ4os3jpaGuuwvpuuou0RLWZYLQhA5 0Zhg== X-Gm-Message-State: AJIora/mxKZiCcLbjTdLogejVvcPBRYKWkMGtfKmpwXaDPf5mpzFXfMM 3gOdtxfOS+xQPm4ve7IXKLs1dqxi50M= X-Google-Smtp-Source: AGRyM1sybC+066Kqk/UJX5DtXiHoEC6YQ3pnVo6d6UN4LTBOrTUWKozREYAynqVV90hSAQRXUSsAaQ== X-Received: by 2002:a17:907:3f29:b0:72b:91df:2c4b with SMTP id hq41-20020a1709073f2900b0072b91df2c4bmr39434382ejc.206.1658397887935; Thu, 21 Jul 2022 03:04:47 -0700 (PDT) Received: from felia.fritz.box (200116b826c37500a4adcf8f67474f65.dip.versatel-1u1.de. [2001:16b8:26c3:7500:a4ad:cf8f:6747:4f65]) by smtp.gmail.com with ESMTPSA id d12-20020a50fe8c000000b0043a554818afsm713684edt.42.2022.07.21.03.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 03:04:47 -0700 (PDT) From: Lukas Bulwahn To: Ard Biesheuvel , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Cc: "Jason A . Donenfeld" , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [PATCH] arm64: adjust KASLR relocation after ARCH_RANDOM removal Date: Thu, 21 Jul 2022 12:04:33 +0200 Message-Id: <20220721100433.18286-1-lukas.bulwahn@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220721_030449_660883_990E0813 X-CRM114-Status: GOOD ( 12.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit aacd149b6238 ("arm64: head: avoid relocating the kernel twice for KASLR") adds the new file arch/arm64/kernel/pi/kaslr_early.c with a small code part guarded by '#ifdef CONFIG_ARCH_RANDOM'. Concurrently, commit 9592eef7c16e ("random: remove CONFIG_ARCH_RANDOM") removes the config CONFIG_ARCH_RANDOM and turns all '#ifdef CONFIG_ARCH_RANDOM' code parts into unconditional code parts, which is generally safe to do. Remove a needless ifdef guard after the ARCH_RANDOM removal. Signed-off-by: Lukas Bulwahn Acked-by: Ard Biesheuvel --- arch/arm64/kernel/pi/kaslr_early.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/pi/kaslr_early.c b/arch/arm64/kernel/pi/kaslr_early.c index 6c3855e69395..17bff6e399e4 100644 --- a/arch/arm64/kernel/pi/kaslr_early.c +++ b/arch/arm64/kernel/pi/kaslr_early.c @@ -94,11 +94,9 @@ asmlinkage u64 kaslr_early_init(void *fdt) seed = get_kaslr_seed(fdt); if (!seed) { -#ifdef CONFIG_ARCH_RANDOM - if (!__early_cpu_has_rndr() || - !__arm64_rndr((unsigned long *)&seed)) -#endif - return 0; + if (!__early_cpu_has_rndr() || + !__arm64_rndr((unsigned long *)&seed)) + return 0; } /*