diff options
author | Tautschnig, Michael <tautschn@amazon.co.uk> | 2016-07-04 13:55:04 +0000 |
---|---|---|
committer | Michal Marek <mmarek@suse.com> | 2016-07-22 14:05:40 +0200 |
commit | 21532b9e5bd597631cfe38d9eb34df069938065b (patch) | |
tree | 7dc2ce41d863044ee9c5ca5c727ac3d98115ac35 | |
parent | ddea05fa148b4d8e66498e522a616d87f9cf81e3 (diff) | |
download | linux-stable-21532b9e5bd597631cfe38d9eb34df069938065b.tar.gz linux-stable-21532b9e5bd597631cfe38d9eb34df069938065b.tar.bz2 linux-stable-21532b9e5bd597631cfe38d9eb34df069938065b.zip |
scripts: Fix size mismatch of kexec_purgatory_size
bin2c is used to create a valid C file out of a binary file where two
symbols will be globally defined: <name> and <name>_size. <name> is
passed as the first parameter of the host binary.
Building using goto-cc reported that the purgatory binary code (the only
current user of this utility) declares kexec_purgatory_size as 'size_t'
where bin2c generate <name>_size to be 'int' so in a 64-bit host where
sizeof(size_t) > sizeof(int) this type mismatch will always yield the
wrong value for big-endian architectures while for little-endian it will
be wrong if the object laid in memory directly after
kexec_purgatory_size contains non-zero value at the time of reading.
This commit changes <name>_size to be size_t instead.
Note:
Another way to fix the problem is to change the type of
kexec_purgatory_size to be 'int' as there's this check in code:
(kexec_purgatory_size <= 0)
Signed-off-by: Michael Tautschnig <tautschn@amazon.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Acked-by: Dave Young <dyoung@redhat.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
-rw-r--r-- | scripts/basic/bin2c.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/basic/bin2c.c b/scripts/basic/bin2c.c index af187e695345..c3d7eef3ad06 100644 --- a/scripts/basic/bin2c.c +++ b/scripts/basic/bin2c.c @@ -29,7 +29,8 @@ int main(int argc, char *argv[]) } while (ch != EOF); if (argc > 1) - printf("\t;\n\nconst int %s_size = %d;\n", argv[1], total); + printf("\t;\n\n#include <linux/types.h>\n\nconst size_t %s_size = %d;\n", + argv[1], total); return 0; } |