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=-11.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 7623DECE58C for ; Fri, 11 Oct 2019 06:46:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B8482196E for ; Fri, 11 Oct 2019 06:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570776360; bh=cJMPVKndQH8vQ2vx8WEHa1cxfsXOSyxG6wfm1I3b+9s=; h=Subject:To:From:Date:List-ID:From; b=g+8WSSPM1dTSdZV0zDkaI7K1HPrzYg2uXl7ZQprA3W3DvPNoNXlshNjPeNfx0MUWp UR2NqleTabekX5pYoVI42iaZxhxw+R8XNfFnrDLxJMOoZnRq4cjbwza0ovxy86mx7U rM0vxFjVnjpegJWh3sHzLA673w8faaJ7S1/3rV6Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727160AbfJKGp7 (ORCPT ); Fri, 11 Oct 2019 02:45:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:52896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726481AbfJKGp7 (ORCPT ); Fri, 11 Oct 2019 02:45:59 -0400 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 CC34D214E0; Fri, 11 Oct 2019 06:45:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570776357; bh=cJMPVKndQH8vQ2vx8WEHa1cxfsXOSyxG6wfm1I3b+9s=; h=Subject:To:From:Date:From; b=LiWtB1d5RXGcDQbWXchzbkQYz2J5+rjid45DYZRzPn/pkUl2iDGFuiyPoNMEpG24r zm80wDGyYtNLOYJtFjKj0uyYZ/CEz6bElgZh2t2T0Jp0XsyPi3bxEKFpgMI5nsyS0X 21OkFbDzMNVnbmqWa/mnoHLVLoTVSQHP7AHX16C4= Subject: patch "firmware: google: increment VPD key_len properly" added to char-misc-linus To: briannorris@chromium.org, gregkh@linuxfoundation.org, groeck@chromium.org, hungte@chromium.org, stable@vger.kernel.org, swboyd@chromium.org From: Date: Fri, 11 Oct 2019 08:45:54 +0200 Message-ID: <157077635414568@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled firmware: google: increment VPD key_len properly to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 442f1e746e8187b9deb1590176f6b0ff19686b11 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Mon, 30 Sep 2019 14:45:22 -0700 Subject: firmware: google: increment VPD key_len properly Commit 4b708b7b1a2c ("firmware: google: check if size is valid when decoding VPD data") adds length checks, but the new vpd_decode_entry() function botched the logic -- it adds the key length twice, instead of adding the key and value lengths separately. On my local system, this means vpd.c's vpd_section_create_attribs() hits an error case after the first attribute it parses, since it's no longer looking at the correct offset. With this patch, I'm back to seeing all the correct attributes in /sys/firmware/vpd/... Fixes: 4b708b7b1a2c ("firmware: google: check if size is valid when decoding VPD data") Cc: Cc: Hung-Te Lin Signed-off-by: Brian Norris Reviewed-by: Stephen Boyd Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20190930214522.240680-1-briannorris@chromium.org Signed-off-by: Greg Kroah-Hartman --- drivers/firmware/google/vpd_decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/google/vpd_decode.c b/drivers/firmware/google/vpd_decode.c index dda525c0f968..5c6f2a74f104 100644 --- a/drivers/firmware/google/vpd_decode.c +++ b/drivers/firmware/google/vpd_decode.c @@ -52,7 +52,7 @@ static int vpd_decode_entry(const u32 max_len, const u8 *input_buf, if (max_len - consumed < *entry_len) return VPD_FAIL; - consumed += decoded_len; + consumed += *entry_len; *_consumed = consumed; return VPD_OK; } -- 2.23.0