diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-02-26 23:41:31 -0800 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2021-03-11 05:00:02 -1000 |
| commit | 7f1968a096301aade2afc4b7eceb7a69e4ab364c (patch) | |
| tree | 621880f1b7be2d6454919eeca7ac0652b2517edd | |
| parent | 5cdb675b4219e33eb9f8a5b3be1a6c9efe2099fc (diff) | |
| download | openembedded-core-7f1968a096301aade2afc4b7eceb7a69e4ab364c.tar.gz | |
dtc: Fix array-bounds error
Fixes
| libfdt/libfdt.h:251:28: error: array subscript 'struct fdt_header[0]' is partly outside array bounds of 'unsigned char[4]' [-Werror=array-bounds]
| 251 | fdth->name = cpu_to_fdt32(val); \
| | ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit cd4fe4ec658ce4861fc970149f78b0ca7fda8fe0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-kernel/dtc/dtc/0001-fdtdump-Fix-gcc11-warning.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-kernel/dtc/dtc_1.6.0.bb | 2 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-kernel/dtc/dtc/0001-fdtdump-Fix-gcc11-warning.patch b/meta/recipes-kernel/dtc/dtc/0001-fdtdump-Fix-gcc11-warning.patch new file mode 100644 index 0000000000..ec825cbf7b --- /dev/null +++ b/meta/recipes-kernel/dtc/dtc/0001-fdtdump-Fix-gcc11-warning.patch @@ -0,0 +1,35 @@ +From 4827e0db6c4f7dea7f4094f49d3bb48ef6dfdc2d Mon Sep 17 00:00:00 2001 +From: David Gibson <david@gibson.dropbear.id.au> +Date: Wed, 6 Jan 2021 14:52:26 +1100 +Subject: [PATCH] fdtdump: Fix gcc11 warning + +In one place, fdtdump abuses fdt_set_magic(), passing it just a small char +array instead of the full fdt header it expects. That's relying on the +fact that in fact fdt_set_magic() will only actually access the first 4 +bytes of the buffer. + +This trips a new warning in GCC 11 - and it's entirely possible it was +always UB. So, don't do that. + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=ca16a723fa9dde9c5da80dba567f48715000e77c] +Signed-off-by: David Gibson <david@gibson.dropbear.id.au> +--- + fdtdump.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fdtdump.c b/fdtdump.c +index 9613bef..d9fb374 100644 +--- a/fdtdump.c ++++ b/fdtdump.c +@@ -217,7 +217,7 @@ int main(int argc, char *argv[]) + char *p = buf; + char *endp = buf + len; + +- fdt_set_magic(smagic, FDT_MAGIC); ++ fdt32_st(smagic, FDT_MAGIC); + + /* poor man's memmem */ + while ((endp - p) >= FDT_MAGIC_SIZE) { +-- +2.30.1 + diff --git a/meta/recipes-kernel/dtc/dtc_1.6.0.bb b/meta/recipes-kernel/dtc/dtc_1.6.0.bb index 92df70d9fc..a407137859 100644 --- a/meta/recipes-kernel/dtc/dtc_1.6.0.bb +++ b/meta/recipes-kernel/dtc/dtc_1.6.0.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRCREV = "2525da3dba9beceb96651dc2986581871dbeca30" +SRC_URI += "file://0001-fdtdump-Fix-gcc11-warning.patch" + S = "${WORKDIR}/git" BBCLASSEXTEND = "native nativesdk" |