summaryrefslogtreecommitdiffstats
path: root/cpukit/dtc/libfdt/fdt_rw.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-06-15 10:00:33 -0600
committerSebastian Huber <sebastian.huber@embedded-brains.de>2021-12-14 16:00:43 +0100
commiteaadf704976f575d6d2c43a96580e85b8eb3c598 (patch)
treefbe9b994994b4f63615cfb50a2cfee4cf7330e46 /cpukit/dtc/libfdt/fdt_rw.c
parentlibfdt: fix undefined behaviour in fdt_splice_() (diff)
downloadrtems-eaadf704976f575d6d2c43a96580e85b8eb3c598.tar.bz2
libfdt: Correct condition for reordering blocks
This condition uses bitwise OR but should be logical OR. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org> Reported-by: kernel test robot <lkp@intel.com> Message-Id: <20200615160033.87328-1-sjg@chromium.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to '')
-rw-r--r--cpukit/dtc/libfdt/fdt_rw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpukit/dtc/libfdt/fdt_rw.c b/cpukit/dtc/libfdt/fdt_rw.c
index 524b520c84..93e4a2b563 100644
--- a/cpukit/dtc/libfdt/fdt_rw.c
+++ b/cpukit/dtc/libfdt/fdt_rw.c
@@ -436,7 +436,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
return struct_size;
}
- if (can_assume(LIBFDT_ORDER) |
+ if (can_assume(LIBFDT_ORDER) ||
!fdt_blocks_misordered_(fdt, mem_rsv_size, struct_size)) {
/* no further work necessary */
err = fdt_move(fdt, buf, bufsize);