mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 09:32:13 +02:00
ovmf: Fix build with gcc8
(From OE-Core rev: 278b00ddccb274150ed85e48e984675b40fc9aaa) (From OE-Core rev: 2e4a05879f56e96bcdc0770d3fe27abc8b9af35e) (From OE-Core rev: 2b3d976392d53afc3033ddf37d2404d61904bf78) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
@@ -0,0 +1,71 @@
|
||||
From 9fce4bab014b9aa618060eba13d6dd04b0fa1b70 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Fri, 2 Mar 2018 17:11:52 +0100
|
||||
Subject: [PATCH 1/4] BaseTools/header.makefile: add "-Wno-stringop-truncation"
|
||||
|
||||
gcc-8 (which is part of Fedora 28) enables the new warning
|
||||
"-Wstringop-truncation" in "-Wall". This warning is documented in detail
|
||||
at <https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html>; the
|
||||
introduction says
|
||||
|
||||
> Warn for calls to bounded string manipulation functions such as strncat,
|
||||
> strncpy, and stpncpy that may either truncate the copied string or leave
|
||||
> the destination unchanged.
|
||||
|
||||
It breaks the BaseTools build with:
|
||||
|
||||
> EfiUtilityMsgs.c: In function 'PrintMessage':
|
||||
> EfiUtilityMsgs.c:484:9: error: 'strncat' output may be truncated copying
|
||||
> between 0 and 511 bytes from a string of length 511
|
||||
> [-Werror=stringop-truncation]
|
||||
> strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
|
||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
> EfiUtilityMsgs.c:469:9: error: 'strncat' output may be truncated copying
|
||||
> between 0 and 511 bytes from a string of length 511
|
||||
> [-Werror=stringop-truncation]
|
||||
> strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
|
||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
> EfiUtilityMsgs.c:511:5: error: 'strncat' output may be truncated copying
|
||||
> between 0 and 511 bytes from a string of length 511
|
||||
> [-Werror=stringop-truncation]
|
||||
> strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
|
||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
The right way to fix the warning would be to implement string concat with
|
||||
snprintf(). However, Microsoft does not appear to support snprintf()
|
||||
before VS2015
|
||||
<https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010>,
|
||||
so we just have to shut up the warning. The strncat() calls flagged above
|
||||
are valid BTW.
|
||||
|
||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Cc: Cole Robinson <crobinso@redhat.com>
|
||||
Cc: Liming Gao <liming.gao@intel.com>
|
||||
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Reviewed-by: Liming Gao <liming.gao@intel.com>
|
||||
---
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status: Backport
|
||||
|
||||
BaseTools/Source/C/Makefiles/header.makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: git/BaseTools/Source/C/Makefiles/header.makefile
|
||||
===================================================================
|
||||
--- git.orig/BaseTools/Source/C/Makefiles/header.makefile
|
||||
+++ git/BaseTools/Source/C/Makefiles/header.makefile
|
||||
@@ -47,9 +47,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT)
|
||||
BUILD_CPPFLAGS += $(INCLUDE) -O2
|
||||
ifeq ($(DARWIN),Darwin)
|
||||
# assume clang or clang compatible flags on OS X
|
||||
-BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
||||
+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
||||
else
|
||||
-BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
|
||||
+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-unused-result -nostdlib -c -g
|
||||
endif
|
||||
BUILD_LFLAGS = $(LDFLAGS)
|
||||
BUILD_CXXFLAGS += -Wno-unused-result
|
||||
@@ -0,0 +1,102 @@
|
||||
From 86dbdac5a25bd23deb4a0e0a97b527407e02184d Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Fri, 2 Mar 2018 17:11:52 +0100
|
||||
Subject: [PATCH 2/4] BaseTools/header.makefile: add "-Wno-restrict"
|
||||
|
||||
gcc-8 (which is part of Fedora 28) enables the new warning
|
||||
"-Wrestrict" in "-Wall". This warning is documented in detail
|
||||
at <https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html>; the
|
||||
introduction says
|
||||
|
||||
> Warn when an object referenced by a restrict-qualified parameter (or, in
|
||||
> C++, a __restrict-qualified parameter) is aliased by another argument,
|
||||
> or when copies between such objects overlap.
|
||||
|
||||
It breaks the BaseTools build (in the Brotli compression library) with:
|
||||
|
||||
> In function 'ProcessCommandsInternal',
|
||||
> inlined from 'ProcessCommands' at dec/decode.c:1828:10:
|
||||
> dec/decode.c:1781:9: error: 'memcpy' accessing between 17 and 2147483631
|
||||
> bytes at offsets 16 and 16 overlaps between 17 and 2147483631 bytes at
|
||||
> offset 16 [-Werror=restrict]
|
||||
> memcpy(copy_dst + 16, copy_src + 16, (size_t)(i - 16));
|
||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
> In function 'ProcessCommandsInternal',
|
||||
> inlined from 'SafeProcessCommands' at dec/decode.c:1833:10:
|
||||
> dec/decode.c:1781:9: error: 'memcpy' accessing between 17 and 2147483631
|
||||
> bytes at offsets 16 and 16 overlaps between 17 and 2147483631 bytes at
|
||||
> offset 16 [-Werror=restrict]
|
||||
> memcpy(copy_dst + 16, copy_src + 16, (size_t)(i - 16));
|
||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Paolo Bonzini <pbonzini@redhat.com> analyzed the Brotli source in detail,
|
||||
and concluded that the warning is a false positive:
|
||||
|
||||
> This seems safe to me, because it's preceded by:
|
||||
>
|
||||
> uint8_t* copy_dst = &s->ringbuffer[pos];
|
||||
> uint8_t* copy_src = &s->ringbuffer[src_start];
|
||||
> int dst_end = pos + i;
|
||||
> int src_end = src_start + i;
|
||||
> if (src_end > pos && dst_end > src_start) {
|
||||
> /* Regions intersect. */
|
||||
> goto CommandPostWrapCopy;
|
||||
> }
|
||||
>
|
||||
> If [src_start, src_start + i) and [pos, pos + i) don't intersect, then
|
||||
> neither do [src_start + 16, src_start + i) and [pos + 16, pos + i).
|
||||
>
|
||||
> The if seems okay:
|
||||
>
|
||||
> (src_start + i > pos && pos + i > src_start)
|
||||
>
|
||||
> which can be rewritten to:
|
||||
>
|
||||
> (pos < src_start + i && src_start < pos + i)
|
||||
>
|
||||
> Then the numbers are in one of these two orders:
|
||||
>
|
||||
> pos <= src_start < pos + i <= src_start + i
|
||||
> src_start <= pos < src_start + i <= pos + i
|
||||
>
|
||||
> These two would be allowed by the "if", but they can only happen if pos
|
||||
> == src_start so they degenerate to the same two orders above:
|
||||
>
|
||||
> pos <= src_start < src_start + i <= pos + i
|
||||
> src_start <= pos < pos + i <= src_start + i
|
||||
>
|
||||
> So it is a false positive in GCC.
|
||||
|
||||
Disable the warning for now.
|
||||
|
||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Cc: Cole Robinson <crobinso@redhat.com>
|
||||
Cc: Liming Gao <liming.gao@intel.com>
|
||||
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||
Reported-by: Cole Robinson <crobinso@redhat.com>
|
||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Reviewed-by: Liming Gao <liming.gao@intel.com>
|
||||
---
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status: Backport
|
||||
BaseTools/Source/C/Makefiles/header.makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: git/BaseTools/Source/C/Makefiles/header.makefile
|
||||
===================================================================
|
||||
--- git.orig/BaseTools/Source/C/Makefiles/header.makefile
|
||||
+++ git/BaseTools/Source/C/Makefiles/header.makefile
|
||||
@@ -47,9 +47,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT)
|
||||
BUILD_CPPFLAGS += $(INCLUDE) -O2
|
||||
ifeq ($(DARWIN),Darwin)
|
||||
# assume clang or clang compatible flags on OS X
|
||||
-BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
||||
+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
||||
else
|
||||
-BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-unused-result -nostdlib -c -g
|
||||
+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -c -g
|
||||
endif
|
||||
BUILD_LFLAGS = $(LDFLAGS)
|
||||
BUILD_CXXFLAGS += -Wno-unused-result
|
||||
@@ -0,0 +1,53 @@
|
||||
From 6866325dd9c17412e555974dde41f9631224db52 Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 7 Mar 2018 10:17:28 +0100
|
||||
Subject: [PATCH 3/4] BaseTools/header.makefile: revert gcc-8 "-Wno-xxx"
|
||||
options on OSX
|
||||
|
||||
I recently added the gcc-8 specific "-Wno-stringop-truncation" and
|
||||
"-Wno-restrict" options to BUILD_CFLAGS, both for "Darwin" (XCODE5 /
|
||||
clang, OSX) and otherwise (gcc, Linux / Cygwin).
|
||||
|
||||
I also regression-tested the change with gcc-4.8 on Linux -- gcc-4.8 does
|
||||
not know either of the (gcc-8 specific) "-Wno-stringop-truncation" and
|
||||
"-Wno-restrict" options, yet the build completed fine (by GCC design).
|
||||
|
||||
Regarding OSX, my expectation was that
|
||||
|
||||
- XCODE5 / clang would either recognize these warnings options (because
|
||||
clang does recognize most -W options of gcc),
|
||||
|
||||
- or, similarly to gcc, clang would simply ignore the "-Wno-xxx" flags
|
||||
that it didn't recognize.
|
||||
|
||||
Neither is the case; the new flags have broken the BaseTools build on OSX.
|
||||
Revert them (for OSX only).
|
||||
|
||||
Cc: Liming Gao <liming.gao@intel.com>
|
||||
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||
Reported-by: Liming Gao <liming.gao@intel.com>
|
||||
Fixes: 1d212a83df0eaf32a6f5d4159beb2d77832e0231
|
||||
Fixes: 9222154ae7b3eef75ae88cdb56158256227cb929
|
||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Reviewed-by: Liming Gao <liming.gao@intel.com>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status: Backport
|
||||
BaseTools/Source/C/Makefiles/header.makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: git/BaseTools/Source/C/Makefiles/header.makefile
|
||||
===================================================================
|
||||
--- git.orig/BaseTools/Source/C/Makefiles/header.makefile
|
||||
+++ git/BaseTools/Source/C/Makefiles/header.makefile
|
||||
@@ -47,7 +47,7 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT)
|
||||
BUILD_CPPFLAGS += $(INCLUDE) -O2
|
||||
ifeq ($(DARWIN),Darwin)
|
||||
# assume clang or clang compatible flags on OS X
|
||||
-BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
||||
+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
||||
else
|
||||
BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -c -g
|
||||
endif
|
||||
@@ -0,0 +1,66 @@
|
||||
From dfb42a5bff78d9239a80731e337855234badef3e Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Fri, 2 Mar 2018 17:11:52 +0100
|
||||
Subject: [PATCH 4/4] BaseTools/GenVtf: silence false "stringop-overflow"
|
||||
warning with memcpy()
|
||||
|
||||
gcc-8 (which is part of Fedora 28) enables the new warning
|
||||
"-Wstringop-overflow" in "-Wall". This warning is documented in detail at
|
||||
<https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html>; the
|
||||
introduction says
|
||||
|
||||
> Warn for calls to string manipulation functions such as memcpy and
|
||||
> strcpy that are determined to overflow the destination buffer.
|
||||
|
||||
It breaks the BaseTools build with:
|
||||
|
||||
> GenVtf.c: In function 'ConvertVersionInfo':
|
||||
> GenVtf.c:132:7: error: 'strncpy' specified bound depends on the length
|
||||
> of the source argument [-Werror=stringop-overflow=]
|
||||
> strncpy (TemStr + 4 - Length, Str, Length);
|
||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
> GenVtf.c:130:14: note: length computed here
|
||||
> Length = strlen(Str);
|
||||
> ^~~~~~~~~~~
|
||||
|
||||
It is a false positive because, while the bound equals the length of the
|
||||
source argument, the destination pointer is moved back towards the
|
||||
beginning of the destination buffer by the same amount (and this amount is
|
||||
range-checked first, so we can't precede the start of the dest buffer).
|
||||
|
||||
Replace both strncpy() calls with memcpy().
|
||||
|
||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Cc: Cole Robinson <crobinso@redhat.com>
|
||||
Cc: Liming Gao <liming.gao@intel.com>
|
||||
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||
Reported-by: Cole Robinson <crobinso@redhat.com>
|
||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Reviewed-by: Liming Gao <liming.gao@intel.com>
|
||||
---
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status: Backport
|
||||
BaseTools/Source/C/GenVtf/GenVtf.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/BaseTools/Source/C/GenVtf/GenVtf.c b/BaseTools/Source/C/GenVtf/GenVtf.c
|
||||
index 2ae9a7be2c..0cd33e71e9 100644
|
||||
--- a/BaseTools/Source/C/GenVtf/GenVtf.c
|
||||
+++ b/BaseTools/Source/C/GenVtf/GenVtf.c
|
||||
@@ -129,9 +129,9 @@ Returns:
|
||||
} else {
|
||||
Length = strlen(Str);
|
||||
if (Length < 4) {
|
||||
- strncpy (TemStr + 4 - Length, Str, Length);
|
||||
+ memcpy (TemStr + 4 - Length, Str, Length);
|
||||
} else {
|
||||
- strncpy (TemStr, Str + Length - 4, 4);
|
||||
+ memcpy (TemStr, Str + Length - 4, 4);
|
||||
}
|
||||
|
||||
sscanf (
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@@ -19,6 +19,10 @@ SRC_URI = "git://github.com/tianocore/edk2.git;branch=master \
|
||||
file://0004-ovmf-enable-long-path-file.patch \
|
||||
file://VfrCompile-increase-path-length-limit.patch \
|
||||
file://no-stack-protector-all-archs.patch \
|
||||
file://0001-BaseTools-header.makefile-add-Wno-stringop-truncatio.patch \
|
||||
file://0002-BaseTools-header.makefile-add-Wno-restrict.patch \
|
||||
file://0003-BaseTools-header.makefile-revert-gcc-8-Wno-xxx-optio.patch \
|
||||
file://0004-BaseTools-GenVtf-silence-false-stringop-overflow-war.patch \
|
||||
"
|
||||
UPSTREAM_VERSION_UNKNOWN = "1"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user