aboutsummaryrefslogtreecommitdiff
path: root/test/py
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-02-15 17:08:11 -0700
committerTom Rini <trini@konsulko.com>2021-02-15 22:31:53 -0500
commit124c255731c76a2b09587378b2bcce561bcd3f2d (patch)
tree03e9ce18107e891c917d48b177560370fc2f6708 /test/py
parent6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01 (diff)
downloadu-boot-124c255731c76a2b09587378b2bcce561bcd3f2d.zip
u-boot-124c255731c76a2b09587378b2bcce561bcd3f2d.tar.gz
u-boot-124c255731c76a2b09587378b2bcce561bcd3f2d.tar.bz2
libfdt: Check for multiple/invalid root nodes
It is possible to construct a devicetree blob with multiple root nodes. Update fdt_check_full() to check for this, along with a root node with an invalid name. CVE-2021-27097 Signed-off-by: Simon Glass <sjg@chromium.org> Reported-by: Bruce Monroe <bruce.monroe@intel.com> Reported-by: Arie Haenel <arie.haenel@intel.com> Reported-by: Julien Lenoir <julien.lenoir@intel.com>
Diffstat (limited to 'test/py')
-rw-r--r--test/py/tests/test_vboot.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py
index 9cdc290..22e8fc1 100644
--- a/test/py/tests/test_vboot.py
+++ b/test/py/tests/test_vboot.py
@@ -255,7 +255,8 @@ def test_vboot(u_boot_console, sha_algo, padding, sign_options, required,
util.run_and_log_expect_exception(
cons, [fit_check_sign, '-f', efit, '-k', dtb],
1, 'Failed to verify required signature')
- run_bootm(sha_algo, 'evil fakeroot', 'Bad Data Hash', False, efit)
+ run_bootm(sha_algo, 'evil fakeroot', 'Bad FIT kernel image format',
+ False, efit)
# Try adding an @ to the kernel node name. This should be detected.
efit = '%stest.evilk.fit' % tmpdir