Commit 4b708b7b authored by Hung-Te Lin's avatar Hung-Te Lin Committed by Greg Kroah-Hartman

firmware: google: check if size is valid when decoding VPD data

The VPD implementation from Chromium Vital Product Data project used to
parse data from untrusted input without checking if the meta data is
invalid or corrupted. For example, the size from decoded content may
be negative value, or larger than whole input buffer. Such invalid data
may cause buffer overflow.

To fix that, the size parameters passed to vpd_decode functions should
be changed to unsigned integer (u32) type, and the parsing of entry
header should be refactored so every size field is correctly verified
before starting to decode.

Fixes: ad2ac9d5 ("firmware: Google VPD: import lib_vpd source files")
Signed-off-by: default avatarHung-Te Lin <hungte@chromium.org>
Cc: stable <stable@vger.kernel.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20190830022402.214442-1-hungte@chromium.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8619e5bd
...@@ -92,8 +92,8 @@ static int vpd_section_check_key_name(const u8 *key, s32 key_len) ...@@ -92,8 +92,8 @@ static int vpd_section_check_key_name(const u8 *key, s32 key_len)
return VPD_OK; return VPD_OK;
} }
static int vpd_section_attrib_add(const u8 *key, s32 key_len, static int vpd_section_attrib_add(const u8 *key, u32 key_len,
const u8 *value, s32 value_len, const u8 *value, u32 value_len,
void *arg) void *arg)
{ {
int ret; int ret;
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include "vpd_decode.h" #include "vpd_decode.h"
static int vpd_decode_len(const s32 max_len, const u8 *in, static int vpd_decode_len(const u32 max_len, const u8 *in,
s32 *length, s32 *decoded_len) u32 *length, u32 *decoded_len)
{ {
u8 more; u8 more;
int i = 0; int i = 0;
...@@ -30,18 +30,39 @@ static int vpd_decode_len(const s32 max_len, const u8 *in, ...@@ -30,18 +30,39 @@ static int vpd_decode_len(const s32 max_len, const u8 *in,
} while (more); } while (more);
*decoded_len = i; *decoded_len = i;
return VPD_OK;
}
static int vpd_decode_entry(const u32 max_len, const u8 *input_buf,
u32 *_consumed, const u8 **entry, u32 *entry_len)
{
u32 decoded_len;
u32 consumed = *_consumed;
if (vpd_decode_len(max_len - consumed, &input_buf[consumed],
entry_len, &decoded_len) != VPD_OK)
return VPD_FAIL;
if (max_len - consumed < decoded_len)
return VPD_FAIL;
consumed += decoded_len;
*entry = input_buf + consumed;
/* entry_len is untrusted data and must be checked again. */
if (max_len - consumed < *entry_len)
return VPD_FAIL;
consumed += decoded_len;
*_consumed = consumed;
return VPD_OK; return VPD_OK;
} }
int vpd_decode_string(const s32 max_len, const u8 *input_buf, s32 *consumed, int vpd_decode_string(const u32 max_len, const u8 *input_buf, u32 *consumed,
vpd_decode_callback callback, void *callback_arg) vpd_decode_callback callback, void *callback_arg)
{ {
int type; int type;
int res; u32 key_len;
s32 key_len; u32 value_len;
s32 value_len;
s32 decoded_len;
const u8 *key; const u8 *key;
const u8 *value; const u8 *value;
...@@ -56,26 +77,14 @@ int vpd_decode_string(const s32 max_len, const u8 *input_buf, s32 *consumed, ...@@ -56,26 +77,14 @@ int vpd_decode_string(const s32 max_len, const u8 *input_buf, s32 *consumed,
case VPD_TYPE_STRING: case VPD_TYPE_STRING:
(*consumed)++; (*consumed)++;
/* key */ if (vpd_decode_entry(max_len, input_buf, consumed, &key,
res = vpd_decode_len(max_len - *consumed, &input_buf[*consumed], &key_len) != VPD_OK)
&key_len, &decoded_len);
if (res != VPD_OK || *consumed + decoded_len >= max_len)
return VPD_FAIL; return VPD_FAIL;
*consumed += decoded_len; if (vpd_decode_entry(max_len, input_buf, consumed, &value,
key = &input_buf[*consumed]; &value_len) != VPD_OK)
*consumed += key_len;
/* value */
res = vpd_decode_len(max_len - *consumed, &input_buf[*consumed],
&value_len, &decoded_len);
if (res != VPD_OK || *consumed + decoded_len > max_len)
return VPD_FAIL; return VPD_FAIL;
*consumed += decoded_len;
value = &input_buf[*consumed];
*consumed += value_len;
if (type == VPD_TYPE_STRING) if (type == VPD_TYPE_STRING)
return callback(key, key_len, value, value_len, return callback(key, key_len, value, value_len,
callback_arg); callback_arg);
......
...@@ -25,8 +25,8 @@ enum { ...@@ -25,8 +25,8 @@ enum {
}; };
/* Callback for vpd_decode_string to invoke. */ /* Callback for vpd_decode_string to invoke. */
typedef int vpd_decode_callback(const u8 *key, s32 key_len, typedef int vpd_decode_callback(const u8 *key, u32 key_len,
const u8 *value, s32 value_len, const u8 *value, u32 value_len,
void *arg); void *arg);
/* /*
...@@ -44,7 +44,7 @@ typedef int vpd_decode_callback(const u8 *key, s32 key_len, ...@@ -44,7 +44,7 @@ typedef int vpd_decode_callback(const u8 *key, s32 key_len,
* If one entry is successfully decoded, sends it to callback and returns the * If one entry is successfully decoded, sends it to callback and returns the
* result. * result.
*/ */
int vpd_decode_string(const s32 max_len, const u8 *input_buf, s32 *consumed, int vpd_decode_string(const u32 max_len, const u8 *input_buf, u32 *consumed,
vpd_decode_callback callback, void *callback_arg); vpd_decode_callback callback, void *callback_arg);
#endif /* __VPD_DECODE_H */ #endif /* __VPD_DECODE_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment