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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB686C0502C for ; Tue, 30 Aug 2022 17:24:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231211AbiH3RYk (ORCPT ); Tue, 30 Aug 2022 13:24:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231366AbiH3RYO (ORCPT ); Tue, 30 Aug 2022 13:24:14 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DB321612A2; Tue, 30 Aug 2022 10:22:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2B4D8B81D12; Tue, 30 Aug 2022 17:21:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41CF7C433C1; Tue, 30 Aug 2022 17:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661880103; bh=rqld0LvDVhzWFpEjDb8wjNHR//5uTqyyn0tKTLTW/0g=; h=From:To:Cc:Subject:Date:From; b=qhSNuriYepyTBn3lRfiNCCtMXnyjkfHSP+B3Hj5WNo0u2eVjNYcyNIKeFNj7XAZiQ 5cAPmqhcBnZteir7DUZ0ImZPav6LoV+J/DlIrS1aOpQHpoKJz2YevdntREP+4u+IO0 Cyyl6+X+HkbJYAY8xgxNRNsQbe9AiQgksD9rWR/heZ0HuOWZ6YljCtfjbYvz4MwqBW x+dbCBnU/s6cYYJYOniUVHJeHdd99TQLqv8/hjgGkbdQL47SX4u/miz8DaZH3A2Khi Ww3MA7NYKRIX9G97+UqfpweNsdCEtPavWR37gDJVXP0p0tQvjPHdTMVl0fy7DwaXn9 gdf1YPfiVzbeg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andy Shevchenko , Jean Delvare , Sasha Levin , jdelvare@suse.com Subject: [PATCH AUTOSEL 5.15 01/23] firmware: dmi: Use the proper accessor for the version field Date: Tue, 30 Aug 2022 13:21:18 -0400 Message-Id: <20220830172141.581086-1-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andy Shevchenko [ Upstream commit d2139dfca361a1f5bfc4d4a23455b1a409a69cd4 ] The byte at offset 6 represents length. Don't take it and drop it immediately by using proper accessor, i.e. get_unaligned_be24(). [JD: Change the subject to something less frightening] Signed-off-by: Andy Shevchenko Signed-off-by: Jean Delvare 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 f191a1f901ac7..0eb6b617f709a 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -630,7 +630,7 @@ static int __init dmi_smbios3_present(const u8 *buf) { if (memcmp(buf, "_SM3_", 5) == 0 && buf[6] < 32 && dmi_checksum(buf, buf[6])) { - dmi_ver = get_unaligned_be32(buf + 6) & 0xFFFFFF; + dmi_ver = get_unaligned_be24(buf + 7); dmi_num = 0; /* No longer specified */ dmi_len = get_unaligned_le32(buf + 12); dmi_base = get_unaligned_le64(buf + 16); -- 2.35.1