]> git.dujemihanovic.xyz Git - u-boot.git/commit
mkimage: fit: Do not tail-pad fitImage with external data
authorMarek Vasut <marex@denx.de>
Fri, 1 May 2020 15:40:25 +0000 (17:40 +0200)
committerTom Rini <trini@konsulko.com>
Mon, 4 May 2020 11:26:57 +0000 (07:26 -0400)
commit20a154f95bfe0a3b5bfba90bea7f001c58217536
treef01b3610a039c506f9367dd1fc2d8e45fc58f99c
parentc693f212c5b0433b3a49a89d87cbff28bf78eb87
mkimage: fit: Do not tail-pad fitImage with external data

There is no reason to tail-pad fitImage with external data to 4-bytes,
while fitImage without external data does not have any such padding and
is often unaligned. DT spec also does not mandate any such padding.

Moreover, the tail-pad fills the last few bytes with uninitialized data,
which could lead to a potential information leak.

$ echo -n xy > /tmp/data ; \
./tools/mkimage -E -f auto -d /tmp/data /tmp/fitImage ; \
hexdump -vC /tmp/fitImage | tail -n 3

before:
00000260  61 2d 6f 66 66 73 65 74  00 64 61 74 61 2d 73 69  |a-offset.data-si|
00000270  7a 65 00 00 78 79 64 64                           |ze..xydd|
                   ^^       ^^ ^^
after:
00000260  61 2d 6f 66 66 73 65 74  00 64 61 74 61 2d 73 69  |a-offset.data-si|
00000270  7a 65 00 78 79                                    |ze.xy|

Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Tom Rini <trini@konsulko.com>
tools/fit_image.c