From patchwork Tue Mar 13 14:09:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 131471 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp786907ljb; Tue, 13 Mar 2018 07:09:56 -0700 (PDT) X-Google-Smtp-Source: AG47ELsrOz4spV3RrODWmnYNkoAnyHzT/o7aPGZY89j41xVl+y5XXOZe5PdhFuDTu2NDKoGxptHp X-Received: by 2002:a17:902:566:: with SMTP id 93-v6mr668953plf.327.1520950195873; Tue, 13 Mar 2018 07:09:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520950195; cv=none; d=google.com; s=arc-20160816; b=U7Q/zEUyihUO00jvU32pWkvBy1dT7oW/IVEu1unKu1yPxofG4h8p5mGboF1rSG4Zdk mDNbrnkdj0hzIy8USEYO275MYE5MDxYa+dYzTYwFtCejO5iywxX32/fm6kWR3Y5h04zO hZDSOrsrhPUxOOzrP3ftnnJuvIBfGXpldLDG+Jkt4UIn1u1aC4PBx2X3WNyKs0dSJo90 hxHt7S5gzdy34VzBJZBSKC7Hrx7s0y4vRmjHQRjfiC+CWYDam5utsEvsybkZVyn9nSMY pBsGgJANMnZxhdQ5ESCByTf40SwHnMLvKvC0MB4xo+Op8/+e1u4RR8fYYJLPMymu6XOf QfPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=jb52CcfHyqGhXprQeTT2FwkKZhJzFd4Enn4en8J64t0=; b=OMFB9ZCxtPn5M/0nUQFv0tIFxwdiD6CgD3BuDkCSGpGyt+PHT70Vl6K9BU00nsVeOF fQrF3RoCcpa3JdO52jNfbf2z0A2vmql6oN23GaxRnA8PqfNnLNO7ib1xRbIQt0ILM5Op hKJ+hY5bDHh0Ap9blC1kV0eLEU760hBpz7+SKqCk9c+SU3AkubBoJz2syDxeqdrEgche Dh6YcMcxrg7onwzPJhVLt1S/Xes3q5KKbNPIsb3qCSbxYcJlJEr2h5GGsLMcGRd6/h/S T+sJLIZvMshZRGE3gRL1jSyFFRQxahL/p0713y879YXvWH1SCO6Bewrh5tMjvZuuAGq/ vkWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=acbflWmB; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 7-v6si191735pll.307.2018.03.13.07.09.55; Tue, 13 Mar 2018 07:09:55 -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; dkim=pass header.i=@linaro.org header.s=google header.b=acbflWmB; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752812AbeCMOJx (ORCPT + 28 others); Tue, 13 Mar 2018 10:09:53 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36945 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752126AbeCMOJu (ORCPT ); Tue, 13 Mar 2018 10:09:50 -0400 Received: by mail-wr0-f195.google.com with SMTP id z12so23106012wrg.4 for ; Tue, 13 Mar 2018 07:09:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jb52CcfHyqGhXprQeTT2FwkKZhJzFd4Enn4en8J64t0=; b=acbflWmBUE02Zgz2jLJFN9pKmDnZMJu4OTLbtrgs9LhrPeZfEFrSVuQiu/6I/SnTd7 soS2ev9mQfsCUi0QA/D/HNLoy26Me9kz96atRiNFieUYHBJWVa/0XkcZmTsapGvFr7GL H08motEsvKYCBf+WiQr2+/k5j9M7j/B9ajv5Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jb52CcfHyqGhXprQeTT2FwkKZhJzFd4Enn4en8J64t0=; b=UsG2aHopmYjyHqhl3p7u1BbulPLhb1qmnhSSY6kIqtjkbMtoQSU4AordGEkTabtAoH eEqpVWNqYXxU1zQ4/fTEC9lMlA23QHF2B7rFLguQXrw6oh+Gol+pN1Vi6ahT5pYA0dns efHX494rsKTN4uEsr4qwA2pGel8Vl6pnk6k4OGLzarPC+8I+S1e+k9NFEK86JEJVm9QP EUCeunJJcjLk5JhJX2yPcl/9OFrszHR/ogeAnnfdEWsxRDWRzAFA6TF4Qy8PAFtzBdNK bsqi3/Wp+voHdwy11qpDP4KMuNdqWcyGDchztaIFg7aTOkIYQ0StMnJZyuygMcasifds dCCw== X-Gm-Message-State: AElRT7HLgcXBfWDggIIg8sMYkcdaJI4kBO8XY7h3IOkzoYbimZwK/zBA Fapb2UjjPnoxLTrrGXcPnPxu7A== X-Received: by 10.223.168.4 with SMTP id l4mr701526wrc.170.1520950189187; Tue, 13 Mar 2018 07:09:49 -0700 (PDT) Received: from localhost.localdomain ([105.148.128.186]) by smtp.gmail.com with ESMTPSA id h20sm386276wrf.65.2018.03.13.07.09.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Mar 2018 07:09:48 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner Cc: hdegoede@redhat.com, tweek@google.com, javierm@redhat.com, jarkko.sakkinen@linux.intel.com, Ard Biesheuvel , linux-kernel@vger.kernel.org Subject: [PATCH 1/1] efi/libstub: tpm: zero initialize pointer variables for mixed mode Date: Tue, 13 Mar 2018 14:09:21 +0000 Message-Id: <20180313140922.17266-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180313140922.17266-1-ard.biesheuvel@linaro.org> References: <20180313140922.17266-1-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As reported by Jeremy, running the new TPM libstub code in mixed mode (i.e., 64-bit kernel on 32-bit UEFI) results in hangs when invoking the TCG2 protocol, or when accessing the log_tbl pool allocation. The reason turns out to be that in both cases, the 64-bit pointer variables are not fully initialized by the 32-bit EFI code, and so we should take care to zero initialize these variables beforehand, or we'll end up dereferencing bogus pointers. Reported-by: Jeremy Cline Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/tpm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.15.1 diff --git a/drivers/firmware/efi/libstub/tpm.c b/drivers/firmware/efi/libstub/tpm.c index da661bf8cb96..13c1edd37e96 100644 --- a/drivers/firmware/efi/libstub/tpm.c +++ b/drivers/firmware/efi/libstub/tpm.c @@ -68,11 +68,11 @@ void efi_retrieve_tpm2_eventlog_1_2(efi_system_table_t *sys_table_arg) efi_guid_t linux_eventlog_guid = LINUX_EFI_TPM_EVENT_LOG_GUID; efi_status_t status; efi_physical_addr_t log_location, log_last_entry; - struct linux_efi_tpm_eventlog *log_tbl; + struct linux_efi_tpm_eventlog *log_tbl = NULL; unsigned long first_entry_addr, last_entry_addr; size_t log_size, last_entry_size; efi_bool_t truncated; - void *tcg2_protocol; + void *tcg2_protocol = NULL; status = efi_call_early(locate_protocol, &tcg2_guid, NULL, &tcg2_protocol);