From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 4/6] efivar: Update to 37 Date: Sat, 04 Jan 2020 16:49:14 +0000 Message-ID: <20200104164916.12051-4-michael.tremer@ipfire.org> In-Reply-To: <20200104164916.12051-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4058229522421892048==" List-Id: --===============4058229522421892048== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This also fixes some build issues with GCC 9. Signed-off-by: Michael Tremer --- config/rootfiles/common/aarch64/efivar | 4 +- config/rootfiles/common/x86_64/efivar | 4 +- lfs/efivar | 6 +- src/patches/efivar-37-compile-fixes-1.patch | 56 +++++++ src/patches/efivar-37-compile-fixes-2.patch | 168 ++++++++++++++++++++ 5 files changed, 232 insertions(+), 6 deletions(-) create mode 100644 src/patches/efivar-37-compile-fixes-1.patch create mode 100644 src/patches/efivar-37-compile-fixes-2.patch diff --git a/config/rootfiles/common/aarch64/efivar b/config/rootfiles/common= /aarch64/efivar index 4018e4c08..4fd100167 100644 --- a/config/rootfiles/common/aarch64/efivar +++ b/config/rootfiles/common/aarch64/efivar @@ -8,10 +8,10 @@ usr/bin/efivar #usr/include/efivar/efivar.h #usr/lib/libefiboot.so usr/lib/libefiboot.so.1 -usr/lib/libefiboot.so.1.35 +usr/lib/libefiboot.so.1.37 #usr/lib/libefivar.so usr/lib/libefivar.so.1 -usr/lib/libefivar.so.1.35 +usr/lib/libefivar.so.1.37 #usr/lib/pkgconfig/efiboot.pc #usr/lib/pkgconfig/efivar.pc #usr/share/man/man1/efivar.1 diff --git a/config/rootfiles/common/x86_64/efivar b/config/rootfiles/common/= x86_64/efivar index 4018e4c08..4fd100167 100644 --- a/config/rootfiles/common/x86_64/efivar +++ b/config/rootfiles/common/x86_64/efivar @@ -8,10 +8,10 @@ usr/bin/efivar #usr/include/efivar/efivar.h #usr/lib/libefiboot.so usr/lib/libefiboot.so.1 -usr/lib/libefiboot.so.1.35 +usr/lib/libefiboot.so.1.37 #usr/lib/libefivar.so usr/lib/libefivar.so.1 -usr/lib/libefivar.so.1.35 +usr/lib/libefivar.so.1.37 #usr/lib/pkgconfig/efiboot.pc #usr/lib/pkgconfig/efivar.pc #usr/share/man/man1/efivar.1 diff --git a/lfs/efivar b/lfs/efivar index 90d4c57e7..a2e86a255 100644 --- a/lfs/efivar +++ b/lfs/efivar @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 35 +VER =3D 37 =20 THISAPP =3D efivar-$(VER) DL_FILE =3D $(THISAPP).tar.bz2 @@ -41,7 +41,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 53da18ea0cf7bba1fd9edf3098037edf +$(DL_FILE)_MD5 =3D 9f067275c5f7aafdd75bfb364280ac9c =20 install : $(TARGET) =20 @@ -72,6 +72,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) =20 + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-37-compile-fixe= s-1.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-37-compile-fixe= s-2.patch cd $(DIR_APP) && make CFLAGS=3D"$(CFLAGS)" LDFLAGS=3D"$(LDFLAGS)" $(MAKETUN= ING) cd $(DIR_APP) && make install =20 diff --git a/src/patches/efivar-37-compile-fixes-1.patch b/src/patches/efivar= -37-compile-fixes-1.patch new file mode 100644 index 000000000..f40942f45 --- /dev/null +++ b/src/patches/efivar-37-compile-fixes-1.patch @@ -0,0 +1,56 @@ +From b98ba8921010d03f46704a476c69861515deb1ca Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Mon, 7 Jan 2019 10:30:59 -0500 +Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers + safely. + +GCC 9 adds -Werror=3Daddress-of-packed-member, which causes us to see the +build error reported at + https://bugzilla.opensuse.org/show_bug.cgi?id=3D1120862 . + +That bug report shows us the following: + +In file included from dp.c:26: +dp.h: In function 'format_vendor_helper': +dp.h:120:37: error: taking address of packed member of 'struct ' = may result in an unaligned pointer value [-Werror=3Daddress-of-packed-member] + 120 | format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ +dp.h:74:25: note: in definition of macro 'format_guid' + 74 | _rc =3D efi_guid_to_str(guid, &_guidstr); \ + | ^~~~ +cc1: all warnings being treated as errors + +This patch makes format_guid() use a local variable as a bounce buffer +in the case that the guid we're passed is aligned as chaotic neutral. + +Note that this only fixes this instance and there may be others that bz +didn't show because it exited too soon, and I don't have a gcc 9 build +in front of me right now. + +Signed-off-by: Peter Jones +--- + src/dp.h | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/dp.h b/src/dp.h +index aa4e390..20cb608 100644 +--- a/src/dp.h ++++ b/src/dp.h +@@ -70,8 +70,15 @@ + #define format_guid(buf, size, off, dp_type, guid) ({ \ + int _rc; \ + char *_guidstr =3D NULL; \ +- \ +- _rc =3D efi_guid_to_str(guid, &_guidstr); \ ++ efi_guid_t _guid; \ ++ const efi_guid_t * const _guid_p =3D \ ++ likely(__alignof__(guid) =3D=3D sizeof(guid)) \ ++ ? guid \ ++ : &_guid; \ ++ \ ++ if (unlikely(__alignof__(guid) =3D=3D sizeof(guid))) \ ++ memmove(&_guid, guid, sizeof(_guid)); \ ++ _rc =3D efi_guid_to_str(_guid_p, &_guidstr); \ + if (_rc < 0) { \ + efi_error("could not build %s GUID DP string", \ + dp_type); \ diff --git a/src/patches/efivar-37-compile-fixes-2.patch b/src/patches/efivar= -37-compile-fixes-2.patch new file mode 100644 index 000000000..bbb6a99a3 --- /dev/null +++ b/src/patches/efivar-37-compile-fixes-2.patch @@ -0,0 +1,168 @@ +From c3c553db85ff10890209d0fe48fb4856ad68e4e0 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 21 Feb 2019 15:20:12 -0500 +Subject: [PATCH] Fix all the places -Werror=3Daddress-of-packed-member catch= es. + +This gets rid of all the places GCC 9's -Werror=3Daddress-of-packed-member +flags as problematic. + +Fixes github issue #123 + +Signed-off-by: Peter Jones +--- + src/dp-message.c | 6 ++++-- + src/dp.h | 12 ++++-------- + src/guid.c | 2 +- + src/include/efivar/efivar.h | 2 +- + src/ucs2.h | 27 +++++++++++++++++++-------- + 5 files changed, 29 insertions(+), 20 deletions(-) + +diff --git a/src/dp-message.c b/src/dp-message.c +index 3724e5f..9f96466 100644 +--- a/src/dp-message.c ++++ b/src/dp-message.c +@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp= dp) + ) / sizeof(efi_ip_addr_t); + format(buf, size, off, "Dns", "Dns("); + for (int i=3D0; i < end; i++) { +- const efi_ip_addr_t *addr =3D &dp->dns.addrs[i]; ++ efi_ip_addr_t addr; ++ ++ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr)); + if (i !=3D 0) + format(buf, size, off, "Dns", ","); + format_ip_addr(buf, size, off, "Dns", +- dp->dns.is_ipv6, addr); ++ dp->dns.is_ipv6, &addr); + } + format(buf, size, off, "Dns", ")"); + break; +diff --git a/src/dp.h b/src/dp.h +index 20cb608..1f921d5 100644 +--- a/src/dp.h ++++ b/src/dp.h +@@ -71,13 +71,9 @@ + int _rc; \ + char *_guidstr =3D NULL; \ + efi_guid_t _guid; \ +- const efi_guid_t * const _guid_p =3D \ +- likely(__alignof__(guid) =3D=3D sizeof(guid)) \ +- ? guid \ +- : &_guid; \ +- \ +- if (unlikely(__alignof__(guid) =3D=3D sizeof(guid))) \ +- memmove(&_guid, guid, sizeof(_guid)); \ ++ const efi_guid_t * const _guid_p =3D &_guid; \ ++ \ ++ memmove(&_guid, guid, sizeof(_guid)); \ + _rc =3D efi_guid_to_str(_guid_p, &_guidstr); \ + if (_rc < 0) { \ + efi_error("could not build %s GUID DP string", \ +@@ -86,7 +82,7 @@ + _guidstr =3D onstack(_guidstr, \ + strlen(_guidstr)+1); \ + _rc =3D format(buf, size, off, dp_type, "%s", \ +- _guidstr); \ ++ _guidstr); \ + } \ + _rc; \ + }) +diff --git a/src/guid.c b/src/guid.c +index 306c9ff..3156b3b 100644 +--- a/src/guid.c ++++ b/src/guid.c +@@ -31,7 +31,7 @@ + extern const efi_guid_t efi_guid_zero; +=20 + int NONNULL(1, 2) PUBLIC +-efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b) ++efi_guid_cmp(const void * const a, const void * const b) + { + return memcmp(a, b, sizeof (efi_guid_t)); + } +diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h +index 316891c..ad6449d 100644 +--- a/src/include/efivar/efivar.h ++++ b/src/include/efivar/efivar.h +@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_gu= id_t *guid) +=20 + extern int efi_guid_is_zero(const efi_guid_t *guid); + extern int efi_guid_is_empty(const efi_guid_t *guid); +-extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b); ++extern int efi_guid_cmp(const void * const a, const void * const b); +=20 + /* import / export functions */ + typedef struct efi_variable efi_variable_t; +diff --git a/src/ucs2.h b/src/ucs2.h +index dbb5900..edd8367 100644 +--- a/src/ucs2.h ++++ b/src/ucs2.h +@@ -23,16 +23,21 @@ + (((val) & ((mask) << (shift))) >> (shift)) +=20 + static inline size_t UNUSED +-ucs2len(const uint16_t * const s, ssize_t limit) ++ucs2len(const void *vs, ssize_t limit) + { + ssize_t i; +- for (i =3D 0; i < (limit >=3D 0 ? limit : i+1) && s[i] !=3D (uint16_t)0; i= ++) ++ const uint16_t *s =3D vs; ++ const uint8_t *s8 =3D vs; ++ ++ for (i =3D 0; ++ i < (limit >=3D 0 ? limit : i+1) && s8[0] !=3D 0 && s8[1] !=3D 0; ++ i++, s8 +=3D 2, s++) + ; + return i; + } +=20 + static inline size_t UNUSED +-ucs2size(const uint16_t * const s, ssize_t limit) ++ucs2size(const void *s, ssize_t limit) + { + size_t rc =3D ucs2len(s, limit); + rc *=3D sizeof (uint16_t); +@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit) + } +=20 + static inline unsigned char * UNUSED +-ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) ++ucs2_to_utf8(const void * const voidchars, ssize_t limit) + { + ssize_t i, j; + unsigned char *ret; ++ const uint16_t * const chars =3D voidchars; +=20 + if (limit < 0) + limit =3D ucs2len(chars, -1); +@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t lim= it) + } +=20 + static inline ssize_t UNUSED NONNULL(4) +-utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) ++utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8) + { + ssize_t req; + ssize_t i, j; ++ uint16_t *ucs2 =3D ucs2void; ++ uint16_t val16; +=20 + if (!ucs2 && size > 0) { + errno =3D EINVAL; +@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int termina= te, uint8_t *utf8) + val =3D utf8[i] & 0x7f; + i +=3D 1; + } +- ucs2[j] =3D val; ++ val16 =3D val; ++ ucs2[j] =3D val16; ++ } ++ if (terminate) { ++ val16 =3D 0; ++ ucs2[j++] =3D val16; + } +- if (terminate) +- ucs2[j++] =3D (uint16_t)0; + return j; + }; +=20 --=20 2.20.1 --===============4058229522421892048==--