From 124c255731c76a2b09587378b2bcce561bcd3f2d Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 15 Feb 2021 17:08:11 -0700 Subject: 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 Reported-by: Bruce Monroe Reported-by: Arie Haenel Reported-by: Julien Lenoir --- test/py/tests/test_vboot.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/py/tests/test_vboot.py') diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py index 9cdc290b9fc..22e8fc10d83 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 -- cgit v1.2.3