qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: part_efi: In is_gpt_valid() check argument validity before allocation 

While this goes somewhat against normal coding style we should ensure
that dev_desc is not NULL before we dereference it in allocation of
legacy_mbr.

Change-Id: Ife52a9f595a429aa265c1fed92099295f80458dc
Reported-by: Coverity (CID: 167292)
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit b351ccf11ae5616bba183aedb2c433b97123be4f)
This commit is contained in:
Tom Rini 2017-10-03 09:38:44 -04:00 committed by Kever Yang
parent 36ac5eead7
commit 2ed173003d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
disk/part_efi.c
View File

@ -931,13 +931,14 @@ static int is_pmbr_valid(legacy_mbr * mbr)
static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba, static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba,
gpt_header *pgpt_head, gpt_entry **pgpt_pte) gpt_header *pgpt_head, gpt_entry **pgpt_pte)
{ {
ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, dev_desc->blksz); /* Confirm valid arguments prior to allocation. */
if (!dev_desc || !pgpt_head) { if (!dev_desc || !pgpt_head) {
printf("%s: Invalid Argument(s)\n", __func__); printf("%s: Invalid Argument(s)\n", __func__);
return 0; return 0;
} }
ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, dev_desc->blksz);
/* Read MBR Header from device */ /* Read MBR Header from device */
if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1) { if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1) {
printf("*** ERROR: Can't read MBR header ***\n"); printf("*** ERROR: Can't read MBR header ***\n");