From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37C1AC2D0DB for ; Fri, 24 Jan 2020 11:34:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 006C921734 for ; Fri, 24 Jan 2020 11:34:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865670; bh=UK7m25F9ZMBaMWRSv7Q+Giy/+sHLZXHNYPoDUZnqReA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VL4zs4SGYRNjsH4zBrrIswzayWYL40zrF1AgI1RN1Crw6P3/1bjfj/p7ZzsASqWYW V3mX0zQiyTEtcJSLo+XOkvzDNWP8gLkUVPLCnhQQe2a+KnTFKa1iXDn5Yn9Z2uot+m ukbe11YmtNjgx4bScU9KU53ozdJr+4cF/KY1p9NM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404732AbgAXLe3 (ORCPT ); Fri, 24 Jan 2020 06:34:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:54334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404390AbgAXLe1 (ORCPT ); Fri, 24 Jan 2020 06:34:27 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 C3E0C222C2; Fri, 24 Jan 2020 11:34:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865667; bh=UK7m25F9ZMBaMWRSv7Q+Giy/+sHLZXHNYPoDUZnqReA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xnFDemwUJYhsKzvvLL5ggjh0h1Cx5VOKOBXlBPcjCNhhPPKVFC89a52GmAuATRIIs dZ0cEvUqhWkkEZTTLeNssFZ1PTvXaxvEtO7hiEicxZ9Hh97mvfLsWe73n4ZugAP6Ya pqUOBj5ou+4ItWzS9micvGvfaZ6DxoFM6ZiNDx7Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jean Delvare , Tony Luck , Borislav Petkov , Sasha Levin Subject: [PATCH 4.19 607/639] firmware: dmi: Fix unlikely out-of-bounds read in save_mem_devices Date: Fri, 24 Jan 2020 10:32:57 +0100 Message-Id: <20200124093205.524880961@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@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: Jean Delvare [ Upstream commit 81dde26de9c08bb04c4962a15608778aaffb3cf9 ] Before reading the Extended Size field, we should ensure it fits in the DMI record. There is already a record length check but it does not cover that field. It would take a seriously corrupted DMI table to hit that bug, so no need to worry, but we should still fix it. Signed-off-by: Jean Delvare Fixes: 6deae96b42eb ("firmware, DMI: Add function to look up a handle and return DIMM size") Cc: Tony Luck Cc: Borislav Petkov Signed-off-by: Sasha Levin --- drivers/firmware/dmi_scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index f2483548cde92..0dc0c78f1fdb2 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -407,7 +407,7 @@ static void __init save_mem_devices(const struct dmi_header *dm, void *v) bytes = ~0ull; else if (size & 0x8000) bytes = (u64)(size & 0x7fff) << 10; - else if (size != 0x7fff) + else if (size != 0x7fff || dm->length < 0x20) bytes = (u64)size << 20; else bytes = (u64)get_unaligned((u32 *)&d[0x1C]) << 20; -- 2.20.1