From patchwork Thu Jul 12 12:21:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 141825 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1445863ljj; Thu, 12 Jul 2018 05:22:08 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcb8qVVOdNl4Yvqhnofa/0yL2zN+8kZqevHX7PgaBNDCI+0h4n5ZpY3mWTq/jnQ6B1XaUYI X-Received: by 2002:a62:8d84:: with SMTP id p4-v6mr2199477pfk.251.1531398127900; Thu, 12 Jul 2018 05:22:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531398127; cv=none; d=google.com; s=arc-20160816; b=i4W/bVbiLayfmtqzOA4cYrbjmt/5nyLx/thdyojNl8AI0qi7JJz0NPCypRcIL9/Ru1 Oz76pG/dfK2jZA44SKI+AhKvNSwRy7KicTJLeIOg+onWDVJsDGpYWmyOrZ+cHqGwB2VW jHR816i1mWkEvP8E0KSVUGSxy8T8rTBQgEkHV/J/Ifv0aY+/hvAKUWcSCaC+ARB0hY3x UtOnzGeNf2naoRHm2TQsDq/Mol2AxxXL4FO2Ujs2Lt6EAxUs8RA9XlRinhROixw8RNcY aGl4NZ6vuOxrKcNtkkJkdVwkMyojdfqc+SCmiYLogkgA21xazJ5FQylSawkWRfv62Dkz +Law== 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=25wg7I0bdUlC4DIeHZFJ0xU9n0s9AKthURt+JptmIew=; b=zo1AwKtjUiItQWgkrC8EZeHV1oKWfXyKrHez6MYar5kNxpyFZv/3yr9yQ6hIp78V8H rd+/dTx9IEwcnIg0Jg3op8FrlRHwvOMn2wMPU4eG757a03sozM87sgG44gUbVT3lTvp9 ba+Sl1jzzqrszgcvWykeFjt5MfPMpH/kn3mD5J/M6Pbgp3YDJ58hfJBvK/HujTkQQKOc DUpl6hnkLzWgrUu+3n1LDXq7p9cpvLMW6C249zmKsxKktILYK+IExBMyD7avqE59MnZR U1h+j1SEamtDb0GWScU44ytoqCIDL4JGqiR5NYPlkKLGgI9RNwRfNkcgt6cmkuiAlqFK gb9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=K5bA4r6s; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (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 v8-v6si7016131pff.248.2018.07.12.05.22.07; Thu, 12 Jul 2018 05:22:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=K5bA4r6s; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726650AbeGLMb0 (ORCPT + 3 others); Thu, 12 Jul 2018 08:31:26 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:34733 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727006AbeGLMb0 (ORCPT ); Thu, 12 Jul 2018 08:31:26 -0400 Received: by mail-wr1-f65.google.com with SMTP id c13-v6so21460348wrt.1 for ; Thu, 12 Jul 2018 05:22:06 -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=zwFKNtIGwJIp24L0NIpBT5xt9rkuDsOvqBjuvChMS0w=; b=K5bA4r6s3sm89jMMXjH9vGTaQW8BSayXkMKAeDp1Gx0Y/T2tdfXw8eIE2MB+al+D4M 5zutWwv8Q4hAgceNrvJdOtzdzcessiLY0K8J+I7sBQkLqalKsvB1oyBmw8Oq3i8L1AH4 9czJW2FoYtIKxFfQM4KSD0zxZFG9apfkKqer0= 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=zwFKNtIGwJIp24L0NIpBT5xt9rkuDsOvqBjuvChMS0w=; b=UtFTcPXhEbCOj3Rxkiuv0QbrfQG8fnzBEdUxJeWUl6+chnaNQIhsR1iGj5YwUp5aNl KwgQRNM5FJjl+0PGlNvBBFQWQjfoXw5NmYoa0dKbLjPS60r8bXoE3RJKPt4Bu+HEr50o WeN7AqkXlYZy2gQooYVioRXZ+gm+gZmcdCQzUSGi6wIt/5NYJMwfWRh/UuSUrb+KfzM3 SLs+abcxr66iYlrVdZlnVBEDxnWGghra7+ExQUEzjXHi3i3Of6wJV1+2IrgDGFagI+AC kNSGZoAXIm12iayD+7R5PevZtisuZjEEr3v47sv9N/fhCoKUMZ3rG4p0X0+hO3MfzZ5e p05Q== X-Gm-Message-State: AOUpUlFQy5pu3wb7Oxs3wvOe3pP6EEW6IIiP9hZaUS9DgbWBBmaQTDhA ENIyG/f4v8RPi8EfFNFgUV/BLr46G5A= X-Received: by 2002:adf:a815:: with SMTP id l21-v6mr1469459wrc.281.1531398125349; Thu, 12 Jul 2018 05:22:05 -0700 (PDT) Received: from localhost.localdomain (33.153.69.91.rev.sfr.net. [91.69.153.33]) by smtp.gmail.com with ESMTPSA id y3-v6sm3551246wmd.24.2018.07.12.05.22.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jul 2018 05:22:04 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: sai.praneeth.prakhya@intel.com, mingo@kernel.org, hdegoede@redhat.com, lukas@wunner.de, Ard Biesheuvel Subject: [PATCH 5/6] efi/x86: add missing NULL initialization in UGA draw protocol discovery Date: Thu, 12 Jul 2018 14:21:53 +0200 Message-Id: <20180712122154.13819-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180712122154.13819-1-ard.biesheuvel@linaro.org> References: <20180712122154.13819-1-ard.biesheuvel@linaro.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org The UGA draw protocol discovery routine looks for a EFI handle that has both the UGA draw protocol and the PCI I/O protocol installed. It checks for the latter by calling handle_protocol() and pass it a PCI I/O protocol pointer variable by reference, but fails to initialize it to NULL, which means the non-NULL check later on in the code could produce false positives, given that the return code of the handle_protocol() call is ignored entirely. So add the missing initialization. Signed-off-by: Ard Biesheuvel --- arch/x86/boot/compressed/eboot.c | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index ac8e442db71f..92b573fd239c 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -359,6 +359,7 @@ setup_uga(struct screen_info *si, efi_guid_t *uga_proto, unsigned long size) if (status != EFI_SUCCESS) continue; + pciio = NULL; efi_call_early(handle_protocol, handle, &pciio_proto, &pciio); status = efi_call_proto(efi_uga_draw_protocol, get_mode, uga,