aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2018-12-21 07:28:41 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-22 09:23:18 (GMT)
commit925f8d4aad5ca1bf18987a3cdcb0e176bddddcf1 (patch)
tree5e53df57ddc8c8944ea7822ad6211aeba770038b
parent2ef8179bb7a6817de3fc9407ab55aa357f2d1e4d (diff)
downloadkernel_replicant_linux-925f8d4aad5ca1bf18987a3cdcb0e176bddddcf1.zip
kernel_replicant_linux-925f8d4aad5ca1bf18987a3cdcb0e176bddddcf1.tar.gz
kernel_replicant_linux-925f8d4aad5ca1bf18987a3cdcb0e176bddddcf1.tar.bz2
tools/firmware/ihex2fw: Replace explicit alignment with ALIGN
(X + 3) & ~3 is the same as ALIGN(X, 4), so replace all of the instances of the formwer in the code with the latter. While at it, introduce a helper variable 'record_size' to avoid duplicating length calculatin code. No functional change intended. Cc: Chris Healy <cphealy@gmail.com> Cc: Kyle McMartin <kyle@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-kernel <linux-kernel@vger.kernel.org> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--tools/firmware/ihex2fw.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/firmware/ihex2fw.c b/tools/firmware/ihex2fw.c
index e081cef..8925b60 100644
--- a/tools/firmware/ihex2fw.c
+++ b/tools/firmware/ihex2fw.c
@@ -135,6 +135,7 @@ int main(int argc, char **argv)
static int process_ihex(uint8_t *data, ssize_t size)
{
struct ihex_binrec *record;
+ size_t record_size;
uint32_t offset = 0;
uint32_t data32;
uint8_t type, crc = 0, crcbyte = 0;
@@ -161,12 +162,13 @@ next_record:
len <<= 8;
len += hex(data + i, &crc); i += 2;
}
- record = malloc((sizeof (*record) + len + 3) & ~3);
+ record_size = ALIGN(sizeof(*record) + len, 4);
+ record = malloc(record_size);
if (!record) {
fprintf(stderr, "out of memory for records\n");
return -ENOMEM;
}
- memset(record, 0, (sizeof(*record) + len + 3) & ~3);
+ memset(record, 0, record_size);
record->len = len;
/* now check if we have enough data to read everything */