From patchwork Thu Sep 29 23:23:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 1684654 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=zx2c4.com header.i=@zx2c4.com header.a=rsa-sha256 header.s=20210105 header.b=nHI+vwbn; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MdqJh4Bgdz1yqS for ; Fri, 30 Sep 2022 09:27:16 +1000 (AEST) Received: from localhost ([::1]:54518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oe2vy-0000Yh-7f for incoming@patchwork.ozlabs.org; Thu, 29 Sep 2022 19:27:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oe2sq-0004qn-FZ; Thu, 29 Sep 2022 19:24:00 -0400 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]:43618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oe2sn-0008VC-MH; Thu, 29 Sep 2022 19:24:00 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id F2E24B825AC; Thu, 29 Sep 2022 23:23:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32C28C433D7; Thu, 29 Sep 2022 23:23:54 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="nHI+vwbn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1664493833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=49FxQV60TFmBCPm/S/dzlRLa4PG449vmaa8+eDrLBqM=; b=nHI+vwbnrnSlY0A5detab0BPBB8qnZ9fP3geHIkXzT7TRr9bSz7zXyvosSE/H7nnT3O5xn 675CjBbRRSfWMi5pxZ4HTEiFJf88O0r8hB+3Z3DW0N4ha9lBpGU96V6GiyCuS8fkx2hGJm KjNc5fT4gJsvNwnzxt2xJkw1ocLxJxY= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 18a64c57 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 29 Sep 2022 23:23:52 +0000 (UTC) From: "Jason A. Donenfeld" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: "Jason A. Donenfeld" , qemu-arm@nongnu.org Subject: [PATCH 2/6] arm: re-randomize rng-seed on reboot Date: Fri, 30 Sep 2022 01:23:35 +0200 Message-Id: <20220929232339.372813-2-Jason@zx2c4.com> In-Reply-To: <20220929232339.372813-1-Jason@zx2c4.com> References: <20220929232339.372813-1-Jason@zx2c4.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2604:1380:4601:e00::1; envelope-from=SRS0=kpRN=2A=zx2c4.com=Jason@kernel.org; helo=ams.source.kernel.org X-Spam_score_int: -67 X-Spam_score: -6.8 X-Spam_bar: ------ X-Spam_report: (-6.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When the system reboots, the rng-seed that the FDT has should be re-randomized, so that the new boot gets a new seed. Since the FDT is in the ROM region at this point, we add a hook right after the ROM has been added, so that we have a pointer to that copy of the FDT. Cc: Peter Maydell Cc: qemu-arm@nongnu.org Signed-off-by: Jason A. Donenfeld Reviewed-by: Bin Meng --- hw/arm/boot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index ada2717f76..6a6f4c92c2 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -683,6 +683,7 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, * the DTB is copied again upon reset, even if addr points into RAM. */ rom_add_blob_fixed_as("dtb", fdt, size, addr, as); + qemu_register_reset(qemu_fdt_randomize_seeds, rom_ptr_for_as(as, addr, size)); g_free(fdt);