From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (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 82D5F1C05 for ; Sat, 23 Mar 2024 06:33:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711175626; cv=none; b=rvmcOHweYFngkJo725QjHA39Z4xRgMr4Dti00yMWwL8fqKf1bCZa86LCfhSNwakw/nRxuostVx0TxK7IqGiUqQ9jq1dPA/3MefHSpbVx6WjnmeZQfTEzkSEEikXmfuLqY9MB7zPfmQy+tVpRk5YpI00CerhfE3fprQZidfmdApE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711175626; c=relaxed/simple; bh=9MoRzpMorl4jmgjybPXxJ3FOpwPB8iAT0iT1EWRFdR8=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=q02MYdkdNdJW8WCiMSdjPrg2KTik1qvAOOX0BxKWA2CvhVR6Chb4vKZK5sQPhGJLpHzRb89K0+vCL5O5G4Xhwiz5BoGdcCVFsdyFqLwiXzyG4Ysm5KvZe3hesH+zy1AGYy1GkjnQ1T7GGyMwdOaT7do71RY22jPWUqNcY81OrVo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ovt.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=OxJHeHs0; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ovt.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="OxJHeHs0" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-610b83ff92bso51148067b3.1 for ; Fri, 22 Mar 2024 23:33:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1711175623; x=1711780423; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=txx7wotKqYRR4TcLWSwMoKBZaEfj0wAl/bTcQ8vVQKg=; b=OxJHeHs0Hv+yCqQjLHaB23SluVeUJE9GjE7FKuiyjZzMX4NHtasCaGDOOm/aeyoHGO 8sWQsYDMzX2Eaqbjp6i1s5DO1Tc4Cxy83IbzEiO/UT101GP7FI3l2XGSy8HgWfG+xXS7 /notuJVtG2c1W20RxLEV6SK9J7hT0geqWO60Do2BdG/+VAvyZLCUY57idZ9QW+EoX2Ql YElaq5k9O/vs7wcmN3JV64hmIXmeNXDKEhMenrk4n8ruwV2wvSgNapVuNtbjHThpioqG 46n/yvxCnH7eXrRG9YpSLOEChnMr7kY+dC8HQ16Ot/q/VgP2wQQdiMjxF2v56esx1Bf7 wBuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711175623; x=1711780423; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=txx7wotKqYRR4TcLWSwMoKBZaEfj0wAl/bTcQ8vVQKg=; b=hENpVZUwHU+kkBxmLC13eA+h0Z6YOy4mCJxA+fAH27Pb6+GHumBsZRT3biRGYfyr1i HXUNEL5Xxj/GFgk1uDYSrh+gOJ0fm3T37QAhu61QbmGt5AEh0rJTXKXmY3viYXBqZcgG jjIcAbx3jrE+vZxIrVQTnYozSoDFn/LLZmFRHok5ueT59OqfY/B6kobjcNL3NMLTilAG T5sll06hdakrJ6ZvkF/V7AfrEGsq6CLSGHND7IoI37r1mUICpB17ZCj5nUJNN6yFNYLK myoEOTTzLHjy50lkqUsgUxx09A1znZmxYP6BgDQC37lRcmDm17O83K+lIgPtC9WbZ7eX yLnA== X-Forwarded-Encrypted: i=1; AJvYcCXpS8lBfKH9pnj+0Ng1IdFnW0j/cZMkOG7d4KRqBPGfxIJToCCSINnvLUD0WgzF2h8xQ3l2drXS8hB52Ro7okweURCiunnZ X-Gm-Message-State: AOJu0YybhhFqJ06FYSBic1Rot4dWvhReaA+/YtJNkqs03kfS6Nv2/oKX brNwCbV0m+ILArkiaT/L06D/aHckVU0SqP3AFkCAszP0o0chVBNzV5bfHuBz/njjgA== X-Google-Smtp-Source: AGHT+IEk5aj2iQAOOQTVlpVPwtoj+Ahn1h2Lsg5jYpIXleZg2+JKC8U+krr/mfKR++Kv6+vz8+cIUOs= X-Received: from hmarynka.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:925]) (user=ovt job=sendgmr) by 2002:a81:49cd:0:b0:60c:c986:7cdd with SMTP id w196-20020a8149cd000000b0060cc9867cddmr435562ywa.0.1711175623549; Fri, 22 Mar 2024 23:33:43 -0700 (PDT) Date: Sat, 23 Mar 2024 06:33:33 +0000 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240323063334.735219-1-ovt@google.com> Subject: [PATCH v2] efi: fix panic in kdump kernel From: Oleksandr Tymoshenko To: Ard Biesheuvel , Johan Hovold Cc: ovt@google.com, stable@vger.kernel.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Check if get_next_variable() is actually valid pointer before calling it. In kdump kernel this method is set to NULL that causes panic during the kexec-ed kernel boot. Tested with QEMU and OVMF firmware. Fixes: bad267f9e18f ("efi: verify that variable services are supported") Cc: stable@vger.kernel.org Signed-off-by: Oleksandr Tymoshenko --- Changes in v2: - Style fix - Added Cc: stable - Added Fixes: trailer --- drivers/firmware/efi/efi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 8859fb0b006d..fdf07dd6f459 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -203,6 +203,8 @@ static bool generic_ops_supported(void) name_size = sizeof(name); + if (!efi.get_next_variable) + return false; status = efi.get_next_variable(&name_size, &name, &guid); if (status == EFI_UNSUPPORTED) return false; -- 2.44.0.396.g6e790dbe36-goog