d5db5382c5
fdt_num_mem_rsv() and fdt_get_mem_rsv() currently don't sanity check their parameters, or the memory reserve section offset in the header. That means that on a corrupted blob they could access outside of the range of memory that they should. This improves their safety checking, meaning they shouldn't access outside the blob's bounds, even if its contents are badly corrupted. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Simon Glass <sjg@chromium.org>
63 lines
1.9 KiB
C
63 lines
1.9 KiB
C
/*
|
|
* libfdt - Flat Device Tree manipulation
|
|
* Testcase for misbehaviour on a truncated string
|
|
* Copyright (C) 2018 David Gibson, IBM Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public License
|
|
* as published by the Free Software Foundation; either version 2.1 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdint.h>
|
|
|
|
#include <libfdt.h>
|
|
|
|
#include "tests.h"
|
|
#include "testdata.h"
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
void *fdt = &truncated_memrsv;
|
|
int err;
|
|
uint64_t addr, size;
|
|
|
|
test_init(argc, argv);
|
|
|
|
err = fdt_check_header(fdt);
|
|
if (err != 0)
|
|
FAIL("Bad header: %s", fdt_strerror(err));
|
|
|
|
err = fdt_num_mem_rsv(fdt);
|
|
if (err != -FDT_ERR_TRUNCATED)
|
|
FAIL("fdt_num_mem_rsv() returned %d instead of -FDT_ERR_TRUNCATED",
|
|
err);
|
|
|
|
err = fdt_get_mem_rsv(fdt, 0, &addr, &size);
|
|
if (err != 0)
|
|
FAIL("fdt_get_mem_rsv() failed on first entry: %s",
|
|
fdt_strerror(err));
|
|
if ((addr != TEST_ADDR_1) || (size != TEST_SIZE_1))
|
|
FAIL("Entry doesn't match: (0x%llx, 0x%llx) != (0x%llx, 0x%llx)",
|
|
(unsigned long long)addr, (unsigned long long)size,
|
|
TEST_ADDR_1, TEST_SIZE_1);
|
|
|
|
err = fdt_get_mem_rsv(fdt, 1, &addr, &size);
|
|
if (err != -FDT_ERR_BADOFFSET)
|
|
FAIL("fdt_get_mem_rsv(1) returned %d instead of -FDT_ERR_BADOFFSET",
|
|
err);
|
|
|
|
PASS();
|
|
}
|