Skip to content

Commit 6d9ff47

Browse files
ikhornMatt Fleming
authored andcommitted
firmware: dmi_scan: Fix dmi_len type
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 <ard@linaro.org> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> Cc: <stable@vger.kernel.org> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
1 parent 7ed620b commit 6d9ff47

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/firmware/dmi_scan.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static const char * __init dmi_string(const struct dmi_header *dm, u8 s)
7878
* We have to be cautious here. We have seen BIOSes with DMI pointers
7979
* pointing to completely the wrong place for example
8080
*/
81-
static void dmi_table(u8 *buf, int len, int num,
81+
static void dmi_table(u8 *buf, u32 len, int num,
8282
void (*decode)(const struct dmi_header *, void *),
8383
void *private_data)
8484
{
@@ -115,7 +115,7 @@ static void dmi_table(u8 *buf, int len, int num,
115115
}
116116

117117
static phys_addr_t dmi_base;
118-
static u16 dmi_len;
118+
static u32 dmi_len;
119119
static u16 dmi_num;
120120

121121
static int __init dmi_walk_early(void (*decode)(const struct dmi_header *,

0 commit comments

Comments
 (0)