Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753107AbbEFP22 (ORCPT ); Wed, 6 May 2015 11:28:28 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:58793 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753022AbbEFP2R (ORCPT ); Wed, 6 May 2015 11:28:17 -0400 Message-ID: <1430926082.11698.8.camel@decadent.org.uk> Subject: Re: [PATCH 3.2 068/221] firmware: dmi_scan: Fix dmi_len type From: Ben Hutchings To: "ivan.khoronzhuk" Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, akpm@linux-foundation.org, Ard Biesheuvel , Matt Fleming Date: Wed, 06 May 2015 16:28:02 +0100 In-Reply-To: <5549D43B.70804@globallogic.com> References: <5549D43B.70804@globallogic.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-qCkPX5W5fwpQTD8VqtfJ" X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.4.249 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3983 Lines: 108 --=-qCkPX5W5fwpQTD8VqtfJ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2015-05-06 at 11:43 +0300, ivan.khoronzhuk wrote: > Hi Ben, >=20 > There is no need in this patch for 3.2, only beginning from 3.19. > SMBIOSv3 is absent in k3.2, and for previous SMBIOS versions 16-bit dmi l= en > is enough. It should had been mentioned in the commit/code, sorry. Thanks, I thought I had dropped the fixes for SMBIOSv3 but evidently I missed one. Ben. > On 05.05.15 04:16, Ben Hutchings wrote: > > 3.2.69-rc1 review patch. If anyone has any objections, please let me k= now. > > > > ------------------ > > > > From: Ivan Khoronzhuk > > > > commit 6d9ff473317245e3e5cd9922b4520411c2296388 upstream. > > > > According to SMBIOSv3 specification the length of DMI table can be > > up to 32bits wide. So use appropriate type to avoid overflow. > > > > It's obvious that dmi_num theoretically can be more than u16 also, > > so it's can be changed to u32 or at least it's better to use int > > instead of u16, but on that moment I cannot imagine dmi structure > > count more than 65535 and it can require changing type of vars that > > work with it. So I didn't correct it. > > > > Acked-by: Ard Biesheuvel > > Signed-off-by: Ivan Khoronzhuk > > Signed-off-by: Matt Fleming > > [bwh: Backported to 3.2: adjust context] > > Signed-off-by: Ben Hutchings > > --- > > drivers/firmware/dmi_scan.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > --- a/drivers/firmware/dmi_scan.c > > +++ b/drivers/firmware/dmi_scan.c > > @@ -69,7 +69,7 @@ static char * __init dmi_string(const st > > * We have to be cautious here. We have seen BIOSes with DMI pointers > > * pointing to completely the wrong place for example > > */ > > -static void dmi_table(u8 *buf, int len, int num, > > +static void dmi_table(u8 *buf, u32 len, int num, > > void (*decode)(const struct dmi_header *, void *), > > void *private_data) > > { > > @@ -99,7 +99,7 @@ static void dmi_table(u8 *buf, int len, > > } > > =20 > > static u32 dmi_base; > > -static u16 dmi_len; > > +static u32 dmi_len; > > static u16 dmi_num; > > =20 > > static int __init dmi_walk_early(void (*decode)(const struct dmi_head= er *, > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-kernel"= in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > Please read the FAQ at http://www.tux.org/lkml/ >=20 --=20 Ben Hutchings If at first you don't succeed, you're doing about average. --=-qCkPX5W5fwpQTD8VqtfJ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIVAwUAVUozB+e/yOyVhhEJAQrhvA//YW7XdeD+hzRo9IJ4wjUWDZhefERdMkYs jHKPXiWj+oGXXQ0O3FtpAMsU7r6vo0MTuvZWc6cOyNzbEKZFsOZBPT+TRW9DQDAY WqsTYm3+JJ1FOYOfUL968N/fQk7QoXCB45nq8t1emec5TSlcUKtMslB+K4bzUX3B 1Uw9+z8icWqT2cHL7e9jG2zLWmtedtGImuE8IJaTJa+UixmbrkNCJKCPCxtF+tM4 cG0TGlQdQlXT3UZ26gnOr47a8h2JwSxg6jiYpwLbk1Z2UfhcddeiPvihDbZmlHsP zJaix1zg4tF/fpsgXlBsaTWXbpJycu3kfPk2GC7WF7JYv9MGhCdWgNXt2DQCQAlm rw+C1ZdMnJns+73ysUViNNlQ2SZZEuDGyUIsWapfZ7oMFMWkJ055T5YH9B+x4J5H KggIDqTQIgJQ5LesbHHU51p03MdMibk12DHK4Ot/rNF8vf8mxpFG+C1WOj91yujo F90v6YkKfnOKBsZBKX2PKEgxlUti4SkwYQyDw+ONEy0Tq/20NXO/Lm9tgJ+bXU68 nJkHNiyjAM6eUHoEX0+7sKACrsSl+TDHA6OM5kzJ8cKAFFeo69tB/5pB2DXdOOjc 20UNfw28sh6wKnCN7VMKyDHAj5T6e22BqBc++o4jID7P5Xv14CN6m+z8mCgiZuaV NJyHNwTbVcA= =t8ou -----END PGP SIGNATURE----- --=-qCkPX5W5fwpQTD8VqtfJ-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/