mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-23 12:14:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

lmb: do not panic in lmb_print_region_flags

Browse Source 
Commit c3cf0dc64f ("lmb: add a check to prevent memory overrun")
addressed a possible buffer overrun using assert_noisy().

Resetting via panic() in lmb_print_region() while allowing invalid
lmb flags elsewhere is not reasonable.

Instead of panicking print a message indicating the problem.

fls() returns an int. Using a u64 for bitpos does not match.
Use int instead.

fls() takes an int as argument. Using 1ull << bitpos generates a u64.
Use 1u << bitpos instead.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Acked-by: Sughosh Ganu <sughosh.ganu@linaro.org>
This commit is contained in:
Heinrich Schuchardt 2024-11-02 07:32:26 +01:00 committed by Tom Rini
parent 1b99c15d73
commit 1f66c0e1f4
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/lmb.c
View File

@ -481,16 +481,22 @@ static int lmb_map_update_notify(phys_addr_t addr, phys_size_t size, u8 op,
static void lmb_print_region_flags(enum lmb_flags flags)
{
u64 bitpos;
const char *flag_str[] = { "none", "no-map", "no-overwrite", "no-notify" };
unsigned int pflags = flags &
(LMB_NOMAP | LMB_NOOVERWRITE | LMB_NONOTIFY);
if (flags != pflags) {
printf("invalid %#x\n", flags);
return;
}
do {
bitpos = flags ? fls(flags) - 1 : 0;
assert_noisy(bitpos < ARRAY_SIZE(flag_str));
int bitpos = pflags ? fls(pflags) - 1 : 0;
printf("%s", flag_str[bitpos]);
flags &= ~(1ull << bitpos);
puts(flags ? ", " : "\n");
} while (flags);
pflags &= ~(1u << bitpos);
puts(pflags ? ", " : "\n");
} while (pflags);
}
static void lmb_dump_region(struct alist *lmb_rgn_lst, char *name)