Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-17 02:15:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: Fix incorect range check in log_get_cat_name()

Browse source 
This allows access to an element after the end of the array. Fix it.

Reported-by: Coverity (CID: 173279)
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2018-06-12 00:04:55 -06:00 • committed by Tom Rini
parent b4c3fb087b
commit c2e4e7e631
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/log.c
View file

@ -38,12 +38,16 @@ static const char *log_level_name[LOGL_COUNT] = {
const char *log_get_cat_name(enum log_category_t cat) const char *log_get_cat_name(enum log_category_t cat)
{ {
if (cat > LOGC_COUNT) const char *name;
return "invalid";
if (cat < 0 || cat >= LOGC_COUNT)
return "<invalid>";
if (cat >= LOGC_NONE) if (cat >= LOGC_NONE)
return log_cat_name[cat - LOGC_NONE]; return log_cat_name[cat - LOGC_NONE];
return uclass_get_name((enum uclass_id)cat); name = uclass_get_name((enum uclass_id)cat);
return name ? name : "<missing>";
} }
enum log_category_t log_get_cat_by_name(const char *name) enum log_category_t log_get_cat_by_name(const char *name)

3
include/log.h
View file

@ -274,7 +274,8 @@ struct log_filter {
* log_get_cat_name() - Get the name of a category * log_get_cat_name() - Get the name of a category
* *
* @cat: Category to look up * @cat: Category to look up
* @return category name (which may be a uclass driver name) * @return category name (which may be a uclass driver name) if found, or
* "<invalid>" if invalid, or "<missing>" if not found
*/ */
const char *log_get_cat_name(enum log_category_t cat); const char *log_get_cat_name(enum log_category_t cat);