From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92F0E3D8902 for ; Tue, 16 Jun 2026 18:30:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781634638; cv=none; b=kVCFAtihXVVp2jeCVXgIxLXxVjrD41lKALolq2Gm+kbbefvDmiK3iwMoqhAW6zdsPQhjup+f+KilQa8KJtixJc/Nk03xnIFegHPN4VaIGFMLZQg1X7mQE51dcW+IZXKTyWes7FHuXlhsu4UtXAXHZFD/N3S2AxF5Niwk8q+TcSI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781634638; c=relaxed/simple; bh=BTI/aAntiQ9xcx69tlVTSh2gnfDkXs2rdrTFgedaEpQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ArvfpEdsy8eGJKx/WEFw3FGMrv8BF9b13D0nG9wQDlzmRIqcnI7ix98oKCbF7mU+WTRUWSzL6S+AYS4qE78mE6vKedRyoV2iuD2IOK2iK0JSb8sURWmT/tZV8W/BsKufbFBKCn8ENvDDkQP0WkRWGA0ilKFU5HFj46iPzHhg3lY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Mh9kBf+a; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Mh9kBf+a" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2c40397e746so30363885ad.3 for ; Tue, 16 Jun 2026 11:30:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781634637; x=1782239437; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ln2AHNDCstBaUrT3DCw2JhDQU5MIDiC1ybsTRxhjJ6s=; b=Mh9kBf+aEFUsMYrEnzOMysyyjK75Jx+vadehy61blzF+5L8atugjdQo6R+5G/u3PQW plZjWiVjWzPIHbKD0PdqSgeNlp8HS9zrGXi4HlIHy7v0e9qW1hZDVifkQNnPx6S7XsBt r+OY/eOXdNnmUphxXRE7tTdTFJzpZjbsQ6FFMoJkK7s2z+BL/EI8tTM2jTGhDpyQmpLw UWfE090yOdgQ+UQwldnAv4ciAItcqJ5qD3WwAvD4GpRxXEePQEjYDcqNrPwmU4XUVo0L PaO7ESeLjZdiWK34RZxm15vB1gik59KB4zVN2HNQIvMAfIIty7hygv6MbKWoYt2bnRTP 9mig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781634637; x=1782239437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ln2AHNDCstBaUrT3DCw2JhDQU5MIDiC1ybsTRxhjJ6s=; b=C1kF9lJF1wpXGOy5SKeZynkoR/vEZGWMG2GPCGXGV7pFHHZT0hngep5Qaz9TxvectV on1QxrArE+5o9R7g+oW42qo8CEIOL8HW/D5UdjP+Fr3/sB4qNmaWJ3M+ihQBHY050DjC iS5C2hi+TNOM9iX02qfnutVmw/dvPIEJO+5MHZW7UCGC8DF5BZrneQKlC5H6Ggn/StJt d/NOfWjDfi3G35zzeZoCqC7oYFqTTzSIwRvUdJLFMjLMFYAOfYMiVgLMdPlmIf4LXtnE 1dV3qERrZkGEpbp62pzRHVr2R7i6DG9PnqVI5kTQmoTVzve0ReynM1u4auG14hqPmY+H 03Qw== X-Forwarded-Encrypted: i=1; AFNElJ+/ZZ1Im4sq3Ed/uiKuLBGlV9XkIOEKlLveKXGTnvDBNh1UuAtE2u5gUaDmbKjWPOAARJOYnUmWgbpa5Kk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6mZagCKIWrhygpC9+RLVszxP2MiN9eumTIhIT4ixZ6MgAs1x+ OOM3Snk950CiOLlY03aAz7z6doF3Rn+E25lW+cKiiPwFT5YP/MD9jWt+ X-Gm-Gg: AfdE7clWHoJoEIoTBgyk7C1p7KgWuryNlhJhPQskqMoW2I7nuKf6tHxOEqk7DcVhzsV TpDzBEVvuEiexYurIG5yDRh45yOT66cIoMFRQCYxZH761ORqsFCpOreTfJaMr7HB5sdBWm6neub hfrU8x+vkD7slOApgq9WrWiZEYrwmCCcGa7KH3I3MGMf1Q7b1MInXkQA86XiaMrsKAuwv+lu/Nu Y8SOi3oUCqp08tW6pXEA6IfZ0Pw8YIGnLQvTaY/JEc49O4U1P5fLIHH/t3MNrbLx1MMHlmYhZqk nRQY3CDncNCEQpRH4ilWssYoVO0Dv9s7W4StxdpF5M3xQ86fuHQVkcliEnb6VbupSRRuMPoZU1G AumckjpTsPm79DTNU7KstlXjUvdjccOq/7P1vXv3AdpL8gPwRocAI6EANCCfufbwiVQ4OZZgAFN BGE+FWDdLqLw2T6ROq1A== X-Received: by 2002:a17:903:2f86:b0:2c0:c2c7:58ad with SMTP id d9443c01a7336-2c6bc0ab9a2mr1960395ad.13.1781634636941; Tue, 16 Jun 2026 11:30:36 -0700 (PDT) Received: from ubuntu.. ([110.9.142.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c43345e3ffsm141092685ad.71.2026.06.16.11.30.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2026 11:30:36 -0700 (PDT) From: Sang-Heon Jeon To: Ard Biesheuvel Cc: Sang-Heon Jeon , Ilias Apalodimas , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] Revert "tpm: do not ignore memblock_reserve return value" Date: Wed, 17 Jun 2026 03:29:56 +0900 Message-ID: <20260616182959.2429774-6-ekffu200098@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260616182959.2429774-1-ekffu200098@gmail.com> References: <20260616182959.2429774-1-ekffu200098@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This reverts commit c33c28f9f6e017702374e1ab907dfa5a63db5301. efi_tpm_eventlog_init() runs from efi_config_parse_tables() during early EFI initialization, before memblock_allow_resize(). At that point memblock_reserve() either succeeds or panics, never returning an error. Therefore the return value check is unreachable, so restore the original unconditional memblock_reserve(). No functional change. Signed-off-by: Sang-Heon Jeon --- drivers/firmware/efi/tpm.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c index cdd431027065..288bcf7a5b99 100644 --- a/drivers/firmware/efi/tpm.c +++ b/drivers/firmware/efi/tpm.c @@ -61,12 +61,7 @@ int __init efi_tpm_eventlog_init(void) } tbl_size = sizeof(*log_tbl) + log_tbl->size; - if (memblock_reserve(efi.tpm_log, tbl_size)) { - pr_err("TPM Event Log memblock reserve fails (0x%lx, 0x%x)\n", - efi.tpm_log, tbl_size); - ret = -ENOMEM; - goto out; - } + memblock_reserve(efi.tpm_log, tbl_size); if (efi.tpm_final_log == EFI_INVALID_TABLE_ADDR) { pr_info("TPM Final Events table not present\n"); -- 2.43.0