Commit 048fe191 authored by Olivier Deprez's avatar Olivier Deprez Committed by TrustedFirmware Code Review
Browse files

Merge "fix(fdt): fix OOB write in uuid parsing function" into integration

parents d31f3194 d0d64245
...@@ -73,6 +73,7 @@ static int read_hex(uint8_t *dest, char *hex_src, unsigned int hex_src_len) ...@@ -73,6 +73,7 @@ static int read_hex(uint8_t *dest, char *hex_src, unsigned int hex_src_len)
int read_uuid(uint8_t *dest, char *uuid) int read_uuid(uint8_t *dest, char *uuid)
{ {
int err; int err;
uint8_t *dest_start = dest;
/* Check that we have enough characters */ /* Check that we have enough characters */
if (strnlen(uuid, UUID_STRING_LENGTH) != UUID_STRING_LENGTH) { if (strnlen(uuid, UUID_STRING_LENGTH) != UUID_STRING_LENGTH) {
...@@ -124,7 +125,7 @@ int read_uuid(uint8_t *dest, char *uuid) ...@@ -124,7 +125,7 @@ int read_uuid(uint8_t *dest, char *uuid)
if (err < 0) { if (err < 0) {
WARN("Error parsing UUID\n"); WARN("Error parsing UUID\n");
/* Clear the buffer on error */ /* Clear the buffer on error */
memset((void *)dest, '\0', UUID_BYTES_LENGTH * sizeof(uint8_t)); memset((void *)dest_start, '\0', UUID_BYTES_LENGTH * sizeof(uint8_t));
return -EINVAL; return -EINVAL;
} }
......
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