Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1613980ybv; Fri, 21 Feb 2020 00:18:26 -0800 (PST) X-Google-Smtp-Source: APXvYqz8hlDIDmwcIcHjOUPgJxxHciwSV889Qf9w6fDfqmJb4BdMC+fKx+hF4Qt/xdSLLrdKNQN/ X-Received: by 2002:aca:f305:: with SMTP id r5mr1030406oih.174.1582273106115; Fri, 21 Feb 2020 00:18:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582273106; cv=none; d=google.com; s=arc-20160816; b=fHp1DlFWFfHAh1AIjZCsnqjq54L2cjziMPwSPEeHeNrbk2G6k1ZeTU4s87nczVV72v PDoWnr60nn4ZupfsgzCgNar2Yvd/aYCOKeqd5n8oOzUbYKcQaOrTeXzichn+VJShV8FP QEHc9sepJki6+erqrUO3MLpXW+ZPzygEW1BiML+2qxJQB9MhDIiM9WTCFbn8XP51LeuH bphmcbxo0GeL2GnnpdwP2DJmy0WkI7+PLGq80Qf6xep2cdnp13JNRRHb2MWGLDxorzpO i7J/DHpXD/BO0OzjM7eafjoxkqlYoeGXHZPo5hVMFEsoTCVGGIePs8GMXYuYvVynsWnp V8XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZEtXNM3TQVRCZT6wz2mHMl4/2h45JlmG9C7w1NX4tJI=; b=lAMGjX7zV+tLAK+jqrs0dQ7IUI6v8hzNl5/ClK1is55Ix4O4lJNPbL033M7OQ1eWng S9HQeT2pQ04MfK/ziLW/CADdyI6JHRWjlzJ0o9Yh0LYGffx9NT/AuLXoew11pJNOSVLG +FiYN/bN7yj60mk3kfuPPtdGpG6drIjXda8SyFHFXOt4s7wnc/WiCjFQqA3IOfit+mNw 8L5HfnQuWrtps7m5ClYcgBzPADKLcLlsifPX0Uq1duI5iL985rRqxiv4eziJ7EPWpxgs O/kC7giO5L/FEPmERzKpi8ZVeZJVJyTPQdE0o2Tgz8KE0U/ZsWaK883DLa/X1dRqf3/S g0Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CNMngkib; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i15si1212906otk.120.2020.02.21.00.18.14; Fri, 21 Feb 2020 00:18:26 -0800 (PST) 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=@kernel.org header.s=default header.b=CNMngkib; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732455AbgBUIRc (ORCPT + 99 others); Fri, 21 Feb 2020 03:17:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:54994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732984AbgBUIRa (ORCPT ); Fri, 21 Feb 2020 03:17:30 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BE3152468A; Fri, 21 Feb 2020 08:17:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582273050; bh=FDLTKae5L6Lt5h3s6D/TeS96VdvhDxPetZvWw6O8jx4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CNMngkibc/ATUazNbyZiNcJ04LWog+1CWkuf9FWn7f+DdMicOdz2Aeu3ChjbhkanN qfPklL4xNhZFf0hGRPJMAjPz9/49Q7zcdV2jOUuvkxiFigE80sFPj/vsjt/0EvxbwJ PFGtXN/5UyHOTEgsFvEvnrDglYPcsDMEYLIXjQeg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ard Biesheuvel , Andy Lutomirski , Ard Biesheuvel , Arvind Sankar , Matthew Garrett , linux-efi@vger.kernel.org, Ingo Molnar , Sasha Levin Subject: [PATCH 4.19 028/191] efi/x86: Map the entire EFI vendor string before copying it Date: Fri, 21 Feb 2020 08:40:01 +0100 Message-Id: <20200221072254.613116725@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072250.732482588@linuxfoundation.org> References: <20200221072250.732482588@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel [ Upstream commit ffc2760bcf2dba0dbef74013ed73eea8310cc52c ] Fix a couple of issues with the way we map and copy the vendor string: - we map only 2 bytes, which usually works since you get at least a page, but if the vendor string happens to cross a page boundary, a crash will result - only call early_memunmap() if early_memremap() succeeded, or we will call it with a NULL address which it doesn't like, - while at it, switch to early_memremap_ro(), and array indexing rather than pointer dereferencing to read the CHAR16 characters. Signed-off-by: Ard Biesheuvel Cc: Andy Lutomirski Cc: Ard Biesheuvel Cc: Arvind Sankar Cc: Matthew Garrett Cc: linux-efi@vger.kernel.org Fixes: 5b83683f32b1 ("x86: EFI runtime service support") Link: https://lkml.kernel.org/r/20200103113953.9571-5-ardb@kernel.org Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- arch/x86/platform/efi/efi.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 335a62e74a2e9..5b0275310070e 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -480,7 +480,6 @@ void __init efi_init(void) efi_char16_t *c16; char vendor[100] = "unknown"; int i = 0; - void *tmp; #ifdef CONFIG_X86_32 if (boot_params.efi_info.efi_systab_hi || @@ -505,14 +504,16 @@ void __init efi_init(void) /* * Show what we know for posterity */ - c16 = tmp = early_memremap(efi.systab->fw_vendor, 2); + c16 = early_memremap_ro(efi.systab->fw_vendor, + sizeof(vendor) * sizeof(efi_char16_t)); if (c16) { - for (i = 0; i < sizeof(vendor) - 1 && *c16; ++i) - vendor[i] = *c16++; + for (i = 0; i < sizeof(vendor) - 1 && c16[i]; ++i) + vendor[i] = c16[i]; vendor[i] = '\0'; - } else + early_memunmap(c16, sizeof(vendor) * sizeof(efi_char16_t)); + } else { pr_err("Could not map the firmware vendor!\n"); - early_memunmap(tmp, 2); + } pr_info("EFI v%u.%.02u by %s\n", efi.systab->hdr.revision >> 16, -- 2.20.1