diff options
| author | Leonidas S. Barbosa <kirotawa@gmail.com> | 2020-03-03 03:56:49 +0000 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2020-04-01 14:44:35 +0200 |
| commit | cbbee58d9f57765e50b12ce18aabbe90390ec640 (patch) | |
| tree | cc9f400e5bd6b0c8f5fbdf0add49cc29516d0d13 | |
| parent | 618799e90566e22554584644e496ff95f425ac48 (diff) | |
| download | kexec-tools-cbbee58d9f57765e50b12ce18aabbe90390ec640.tar.gz | |
Removing condition that will never be met after calls xmalloc and xrealloc
Hi,
Looking in the kexec-tools code I found these conditions that
seems will never be met. Not sure if that was intentional for explicitity,
if it was the case, please disconsider this patch.
xmalloc and xrealloc when fails calls die() that calls exit(1).
Checks for if(!memory) after they are called will never be met that
condition, since the process will be exited after an allocation fail.
Signed-off-by: Leonidas S. Barbosa <kirotawa@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/arm/kexec-zImage-arm.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/kexec/arch/arm/kexec-zImage-arm.c b/kexec/arch/arm/kexec-zImage-arm.c index f9d452fb..98459251 100644 --- a/kexec/arch/arm/kexec-zImage-arm.c +++ b/kexec/arch/arm/kexec-zImage-arm.c @@ -228,11 +228,6 @@ int atag_arm_load(struct kexec_info *info, unsigned long base, struct tag *params; buf = xmalloc(getpagesize()); - if (!buf) { - fprintf(stderr, "Compiling ATAGs: out of memory\n"); - return -1; - } - memset(buf, 0xff, getpagesize()); params = (struct tag *)buf; @@ -315,8 +310,6 @@ static int setup_dtb_prop(char **bufp, off_t *sizep, int parentoffset, dtb_size += fdt_node_len(node_name); fdt_set_totalsize(dtb_buf, dtb_size); dtb_buf = xrealloc(dtb_buf, dtb_size); - if (dtb_buf == NULL) - die("xrealloc failed\n"); off = fdt_add_subnode(dtb_buf, parentoffset, node_name); } @@ -340,8 +333,6 @@ static int setup_dtb_prop(char **bufp, off_t *sizep, int parentoffset, if (fdt_totalsize(dtb_buf) < dtb_size) { fdt_set_totalsize(dtb_buf, dtb_size); dtb_buf = xrealloc(dtb_buf, dtb_size); - if (dtb_buf == NULL) - die("xrealloc failed\n"); } if (fdt_setprop(dtb_buf, off, prop_name, @@ -616,9 +607,6 @@ int zImage_arm_load(int argc, char **argv, const char *buf, off_t len, uint64_t start, end; modified_cmdline = xmalloc(COMMAND_LINE_SIZE); - if (!modified_cmdline) - return -1; - memset(modified_cmdline, '\0', COMMAND_LINE_SIZE); if (command_line) { |