diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2019-07-14 18:12:32 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2019-07-16 22:17:21 +0000 |
| commit | 06e921b185f4f7af0a51bb2451cd56eb6c5b26da (patch) | |
| tree | aac648f0c0945ef3258a401a4878ad502359f658 | |
| parent | c0b352ec9236e8fe6a42c00e541e3579d6df52e6 (diff) | |
| download | u-boot-06e921b185f4f7af0a51bb2451cd56eb6c5b26da.tar.gz u-boot-06e921b185f4f7af0a51bb2451cd56eb6c5b26da.tar.bz2 u-boot-06e921b185f4f7af0a51bb2451cd56eb6c5b26da.zip | |
disk: efi: avoid unaligned pointer error
When building with GCC 9.1 an error occurs:
disk/part_efi.c: In function ‘gpt_verify_partitions’:
disk/part_efi.c:737:49: error: taking address of packed member of
‘struct _gpt_entry’ may result in an unaligned pointer value
[-Werror=address-of-packed-member]
737 | gpt_convert_efi_name_to_char(efi_str, gpt_e[i].partition_name,
| ~~~~~~~~^~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [scripts/Makefile.build:279: disk/part_efi.o] Error 1
make: *** [Makefile:1594: disk] Error 2
Adjust gpt_convert_efi_name_to_char() to accept unaligned strings.
Reported-by: Ramon Fried <rfried.dev@gmail.com>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| -rw-r--r-- | disk/part_efi.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/disk/part_efi.c b/disk/part_efi.c index 3e026697db..359b55a818 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -670,9 +670,18 @@ err: return ret; } -static void gpt_convert_efi_name_to_char(char *s, efi_char16_t *es, int n) +/** + * gpt_convert_efi_name_to_char() - convert u16 string to char string + * + * TODO: this conversion only supports ANSI characters + * + * @s: target buffer + * @es: u16 string to be converted + * @n: size of target buffer + */ +static void gpt_convert_efi_name_to_char(char *s, void *es, int n) { - char *ess = (char *)es; + char *ess = es; int i, j; memset(s, '\0', n); |