[U-Boot] [PATCH 1/1] GPT: incomplete initialization in allocate_disk_part
memset(newpart, '\0', sizeof(newpart)); only initializes the firest 4 or 8 bytes of *newpart and not the whole structure disk_part.
We should use sizeof(struct disk_part).
Identified by cppcheck.
Fixes: 09a49930e41 GPT: read partition table from device into a data structure Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de --- cmd/gpt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmd/gpt.c b/cmd/gpt.c index 638aa19826..a9c562123f 100644 --- a/cmd/gpt.c +++ b/cmd/gpt.c @@ -190,10 +190,10 @@ static void del_gpt_info(void) static struct disk_part *allocate_disk_part(disk_partition_t *info, int partnum) { struct disk_part *newpart; - newpart = malloc(sizeof(*newpart)); + newpart = malloc(sizeof(struct disk_part)); if (!newpart) return ERR_PTR(-ENOMEM); - memset(newpart, '\0', sizeof(newpart)); + memset(newpart, '\0', sizeof(struct disk_part));
newpart->gpt_part_info.start = info->start; newpart->gpt_part_info.size = info->size;
On 21.09.2017 12:51, Heinrich Schuchardt wrote:
memset(newpart, '\0', sizeof(newpart)); only initializes the firest 4 or 8 bytes of *newpart and not the whole structure disk_part.
We should use sizeof(struct disk_part).
Identified by cppcheck.
Fixes: 09a49930e41 GPT: read partition table from device into a data structure Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de
cmd/gpt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmd/gpt.c b/cmd/gpt.c index 638aa19826..a9c562123f 100644 --- a/cmd/gpt.c +++ b/cmd/gpt.c @@ -190,10 +190,10 @@ static void del_gpt_info(void) static struct disk_part *allocate_disk_part(disk_partition_t *info, int partnum) { struct disk_part *newpart;
- newpart = malloc(sizeof(*newpart));
- newpart = malloc(sizeof(struct disk_part)); if (!newpart) return ERR_PTR(-ENOMEM);
- memset(newpart, '\0', sizeof(newpart));
memset(newpart, '\0', sizeof(struct disk_part));
newpart->gpt_part_info.start = info->start; newpart->gpt_part_info.size = info->size;
Why don't you use calloc() instead and drop the memset completely?
Thanks, Stefan
memset(newpart, '\0', sizeof(newpart)); only initializes the firest 4 or 8 bytes of *newpart and not the whole structure disk_part.
We should use sizeof(struct disk_part).
Instead of malloc and memset we can use calloc.
Identified by cppcheck.
Fixes: 09a49930e41 GPT: read partition table from device into a data structure Cc: Stefan Roese sr@denx.de Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de --- v2 use calloc as suggested by Stefan --- cmd/gpt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/cmd/gpt.c b/cmd/gpt.c index 638aa19826..d4406e3120 100644 --- a/cmd/gpt.c +++ b/cmd/gpt.c @@ -190,10 +190,9 @@ static void del_gpt_info(void) static struct disk_part *allocate_disk_part(disk_partition_t *info, int partnum) { struct disk_part *newpart; - newpart = malloc(sizeof(*newpart)); + newpart = calloc(1, sizeof(struct disk_part)); if (!newpart) return ERR_PTR(-ENOMEM); - memset(newpart, '\0', sizeof(newpart));
newpart->gpt_part_info.start = info->start; newpart->gpt_part_info.size = info->size;
On 21.09.2017 19:03, Heinrich Schuchardt wrote:
memset(newpart, '\0', sizeof(newpart)); only initializes the firest 4 or 8 bytes of *newpart and not the whole structure disk_part.
We should use sizeof(struct disk_part).
Instead of malloc and memset we can use calloc.
Identified by cppcheck.
Fixes: 09a49930e41 GPT: read partition table from device into a data structure Cc: Stefan Roese sr@denx.de Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de
v2 use calloc as suggested by Stefan
cmd/gpt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/cmd/gpt.c b/cmd/gpt.c index 638aa19826..d4406e3120 100644 --- a/cmd/gpt.c +++ b/cmd/gpt.c @@ -190,10 +190,9 @@ static void del_gpt_info(void) static struct disk_part *allocate_disk_part(disk_partition_t *info, int partnum) { struct disk_part *newpart;
- newpart = malloc(sizeof(*newpart));
- newpart = calloc(1, sizeof(struct disk_part)); if (!newpart) return ERR_PTR(-ENOMEM);
memset(newpart, '\0', sizeof(newpart));
newpart->gpt_part_info.start = info->start; newpart->gpt_part_info.size = info->size;
Reviewed-by: Stefan Roese sr@denx.de
Thanks, Stefan
On 21 September 2017 at 23:24, Stefan Roese sr@denx.de wrote:
On 21.09.2017 19:03, Heinrich Schuchardt wrote:
memset(newpart, '\0', sizeof(newpart)); only initializes the firest 4 or 8 bytes of *newpart and not the whole structure disk_part.
We should use sizeof(struct disk_part).
Instead of malloc and memset we can use calloc.
Identified by cppcheck.
Fixes: 09a49930e41 GPT: read partition table from device into a data structure Cc: Stefan Roese sr@denx.de Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de
v2 use calloc as suggested by Stefan
cmd/gpt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Thu, Sep 21, 2017 at 07:03:06PM +0200, Heinrich Schuchardt wrote:
memset(newpart, '\0', sizeof(newpart)); only initializes the firest 4 or 8 bytes of *newpart and not the whole structure disk_part.
We should use sizeof(struct disk_part).
Instead of malloc and memset we can use calloc.
Identified by cppcheck.
Fixes: 09a49930e41 GPT: read partition table from device into a data structure Reported-by: Coverity (CID: 167228) Cc: Stefan Roese sr@denx.de Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de Reviewed-by: Stefan Roese sr@denx.de Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
participants (4)
-
Heinrich Schuchardt -
Simon Glass -
Stefan Roese -
Tom Rini