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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5BE05C6FD1C for ; Wed, 22 Mar 2023 14:27:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cRUTpXARpY462Y/qA9fFUw1qMgMzLgT62X6O8EswZ54=; b=O2V/YTH6QT5ETO XDELcOyK3c2IslZ+nW1E/h9OKkh6HoqYQSrgOglAtQB0TZu3FcztN5VB1rDdthpDBpWrT6LEoS3PP s38ncFS7JWfxkfqQYDQSJqdsp2SVSH/PTBVeUSYrNv40wbx6R8y+js74ap/ihCStRglDZCv9a+M54 0v4pVdl+mie0p6mqdbg9+c1hN8vDkwHjq3I//jUcffcK+q7iGvKvhM44twR16JAbEE5yc5h3RsHqr 8PW7wGycvFQLuZ+vw9zGM02kjmIUGFN9/OLRkxPGR3sH8jkv2Jaa46HDqll3s6SMTJDf+Z+jPBswl EGsZkV2rehQtla9lazvQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pezQL-00GHri-2h; Wed, 22 Mar 2023 14:26:45 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pezQ9-00GHnV-1r for linux-arm-kernel@lists.infradead.org; Wed, 22 Mar 2023 14:26:36 +0000 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 5464AB81D07; Wed, 22 Mar 2023 14:26:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6CFBC4339B; Wed, 22 Mar 2023 14:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679495191; bh=/pQl1T/l+bkRAhDaMaRrFUb1vkonMeAYR0omTnvlKko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d4GxiiM8EbOLGONlgb8ht8bNuGR65CpQ6PmZxseV/QEwpCy9T9prJyxfLTsZQu6BL A7Ez6CFlGYzk3OWYNnkmg3DvKczLdlBfR2cTIRBXGXRAQELMZqLz9rZfCNKMqgqJ1i YIl22knKo6pEUaaWMauMd5vmwDiSI/FXk1x/Vc+yhmBg/FfDcfvsk83kgSFnFAD47j PFSt+83XK3FcUd6r3dUNqhoW58qYU9jcnRtIqjVDXoHpqFiXe5+XS8hCfrtDOkhl2c XcbJhQbikWDm6o/RMqJ22P7oCzb/GqRzONs6N5l/IF8G4XI2B8NiJdzyxQWbcCAE7K 5wey3pZ4M1Xqg== From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Darren Hart , Andrea Righi Subject: [PATCH 1/3] efi/libstub: smbios: Use length member instead of record struct size Date: Wed, 22 Mar 2023 15:26:19 +0100 Message-Id: <20230322142621.3685058-2-ardb@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322142621.3685058-1-ardb@kernel.org> References: <20230322142621.3685058-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1003; i=ardb@kernel.org; h=from:subject; bh=/pQl1T/l+bkRAhDaMaRrFUb1vkonMeAYR0omTnvlKko=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIUVagOvs/4sTZurG/6i/YXdjvYRX5CNN5e3BB5U/J2+36 HCP0BPsKGVhEONgkBVTZBGY/ffdztMTpWqdZ8nCzGFlAhnCwMUpABOJSmD477koyyjKNfZe0EmG wy+LgvpOzWjft8uJJfnDj6Iy4VbGNkaGA5Y5Ehb389t7kxpuPvb4dk938wanuvASvZ+FTMxbagW YAA== X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230322_072633_767563_893716F3 X-CRM114-Status: GOOD ( 14.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The type 1 SMBIOS record happens to always be the same size, but there are other record types which have been augmented over time, and so we should really use the length field in the header to decide where the string table starts. Fixes: 550b33cfd4452968 ("arm64: efi: Force the use of ...") Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/smbios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/efi/libstub/smbios.c b/drivers/firmware/efi/libstub/smbios.c index 460418b7f5f5e9ab..aadb422b9637dfc0 100644 --- a/drivers/firmware/efi/libstub/smbios.c +++ b/drivers/firmware/efi/libstub/smbios.c @@ -36,7 +36,7 @@ const u8 *__efi_get_smbios_string(u8 type, int offset, int recsize) if (status != EFI_SUCCESS) return NULL; - strtable = (u8 *)record + recsize; + strtable = (u8 *)record + record->length; for (int i = 1; i < ((u8 *)record)[offset]; i++) { int len = strlen(strtable); -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel