libfdt: fix fdt_check_full buffer overrun
PATCH 1/1 libfdt: fix fdt_check_full buffer overrun
From: Patrick Oppenlander <[email protected]>
fdt_check_header assumes that its argument points to a complete header and can read data beyond the FDT_V1_SIZE bytes which fdt_check_full can provide.
fdt_header_size can safely return a header size with FDT_V1_SIZE bytes available and will return a usable value even for a corrupted header.
--- libfdt/fdt_check.c | 2 ++ 1 file changed, 2 insertions(+)
libfdt/fdt_check.c +2 -0
@@ -22,6 +22,8 @@ int fdt_check_full(const void *fdt, size_t bufsize)if (bufsize <FDT_V1_SIZE )return -FDT_ERR_TRUNCATED ; +if (bufsize <fdt_header_size (fdt)) +return -FDT_ERR_TRUNCATED ; err =fdt_check_header (fdt);if (err !=0 )return err;
Signature · 1 line
2.27.0
A message that is not in the archive (sent off-list or not yet received): 20200709041451.338548-1-patrick.oppenlander-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
David Gibson
AppliedQuoted 10 lines · On Thu, Jul 09, 2020 at 02:14:51PM +1000…
From: Patrick Oppenlander <[email protected]>
fdt_check_headerassumes that its argument points to a complete header and can read data beyond theFDT_V1_SIZEbytes whichfdt_check_fullcan provide.
fdt_header_sizecan safely return a header size withFDT_V1_SIZEbytes available and will return a usable value even for a corrupted header.Signed-off-by Patrick Oppenlander <[email protected]>
Applied, thanks.
Quoted 17 lines
--- libfdt/fdt_check.c | 2 ++ 1 file changed, 2 insertions(+)libfdt/fdt_check.c +2
-0@@ -22,6 +22,8 @@ int fdt_check_full(const void *fdt, size_t bufsize)if (bufsize <FDT_V1_SIZE )return -FDT_ERR_TRUNCATED ; +if (bufsize <fdt_header_size (fdt)) +return -FDT_ERR_TRUNCATED ; err =fdt_check_header (fdt);if (err !=0 )return err;
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson