diff options
| author | Aleksey Makarov <aleksey.makarov@gmail.com> | 2012-06-27 00:53:43 +0700 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2012-06-27 09:16:47 +0900 |
| commit | be902019c6161ecead58d2789c73e2999ed9c30b (patch) | |
| tree | 49f871a651bba322bc20835b42487e6203573b84 | |
| parent | bfca8b3f9dbff356a3970e282c1f94e45f076b48 (diff) | |
| download | kexec-tools-be902019c6161ecead58d2789c73e2999ed9c30b.tar.gz | |
Fix format strings of die()
One of them caused crash when user specifies a file that does not
exist.
Signed-off-by: Aleksey Makarov <aleksey.makarov@gmail.com>
Removed trailing whitespace.
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 2 | ||||
| -rw-r--r-- | kexec/kexec-elf-rel.c | 6 | ||||
| -rw-r--r-- | kexec/kexec.c | 2 | ||||
| -rw-r--r-- | kexec/lzma.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c index a1291a6e..c795037c 100644 --- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c +++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c @@ -86,6 +86,6 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), unsigned long r_type, } return; overflow: - die("overflow in relocation type %s val %Lx\n", + die("overflow in relocation type %s val %lx\n", reloc_name(r_type), value); } diff --git a/kexec/kexec-elf-rel.c b/kexec/kexec-elf-rel.c index c04c972e..fc90e424 100644 --- a/kexec/kexec-elf-rel.c +++ b/kexec/kexec-elf-rel.c @@ -513,7 +513,7 @@ void elf_rel_set_symbol(struct mem_ehdr *ehdr, name); } if (sym.st_size != size) { - die("Symbol: %s has size: %ld not %ld\n", + die("Symbol: %s has size: %lld not %ld\n", name, sym.st_size, size); } shdr = &ehdr->e_shdr[sym.st_shndx]; @@ -534,10 +534,10 @@ void elf_rel_get_symbol(struct mem_ehdr *ehdr, result = elf_rel_find_symbol(ehdr, name, &sym); if (result < 0) { - die("Symbol: %s not found cannot get\n"); + die("Symbol: %s not found cannot get\n", name); } if (sym.st_size != size) { - die("Symbol: %s has size: %ld not %ld\n", + die("Symbol: %s has size: %lld not %ld\n", name, sym.st_size, size); } shdr = &ehdr->e_shdr[sym.st_shndx]; diff --git a/kexec/kexec.c b/kexec/kexec.c index d2d05a8f..5ab01969 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c @@ -321,7 +321,7 @@ void add_segment_phys_virt(struct kexec_info *info, * thing. */ if (base & (pagesize -1)) { - die("Base address: %x is not page aligned\n", base); + die("Base address: %lx is not page aligned\n", base); } if (phys) diff --git a/kexec/lzma.c b/kexec/lzma.c index 2490de61..939aeb3d 100644 --- a/kexec/lzma.c +++ b/kexec/lzma.c @@ -168,7 +168,7 @@ char *lzma_decompress_file(const char *filename, off_t *r_size) } fp = lzopen(filename, "rb"); if (fp == 0) { - die("Cannot open `%s': %s\n", filename); + die("Cannot open `%s'\n", filename); } size = 0; allocated = 65536; |