shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-06 13:17:44 +03:00
Code

boot: Fix name length comparison

Browse Source 
(cherry picked from commit 2198a77391)
This commit is contained in:
Jan Janssen 2021-12-27 22:49:02 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent a4e4c3377d
commit 630da18817
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/boot/efi/bcd.c
View File

@ -19,6 +19,7 @@
# define UINT32 uint32_t
# define UINT64 uint64_t
# define UINTN size_t
# define strlena(s) strlen(s)
# define strncaseeqa(a, b, n) strncaseeq((a), (b), (n))
# define TEST_STATIC static
#endif
@ -157,7 +158,7 @@ static const Key *get_key(const UINT8 *bcd, UINT32 bcd_len, UINT32 offset, const
return NULL;
if (*name) {
if (strncaseeqa(name, key->key_name, key->key_name_len) && !name[key->key_name_len])
if (strncaseeqa(name, key->key_name, key->key_name_len) && strlena(name) == key->key_name_len)
name += key->key_name_len;
else
return NULL;
@ -201,7 +202,7 @@ static const KeyValue *get_key_value(const UINT8 *bcd, UINT32 bcd_len, const Key
if ((UINT64) kv->data_offset + kv->data_size >= bcd_len)
continue;
if (strncaseeqa(name, kv->name, kv->name_len) && !name[kv->name_len])
if (strncaseeqa(name, kv->name, kv->name_len) && strlena(name) == kv->name_len)
return kv;
}