[PATCH 1/1] log: correct and check array size of log categories

[Heinrich Schuchardt]

The log command has led to NULL dereferences if an unknown category name
name was used due to missing entries in the list of category names.

Add compile time checks for the array sizes of log_cat_name and
log_lvl_name to avoid future mishaps.

Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
 common/log.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/log.c b/common/log.c
index b7a6ebe298..9b496b5c40 100644
--- a/common/log.c
+++ b/common/log.c
@@ -13,7 +13,7 @@

 DECLARE_GLOBAL_DATA_PTR;

-static const char *log_cat_name[LOGC_COUNT - LOGC_NONE] = {
+static const char *log_cat_name[] = {
 	"none",
 	"arch",
 	"board",
@@ -28,7 +28,10 @@ static const char *log_cat_name[LOGC_COUNT - LOGC_NONE] = {
 	"acpi",
 };

-static const char *log_level_name[LOGL_COUNT] = {
+_Static_assert(ARRAY_SIZE(log_cat_name) == LOGC_COUNT - LOGC_NONE,
+	       "log_cat_name size");
+
+static const char *log_level_name[] = {
 	"EMERG",
 	"ALERT",
 	"CRIT",
@@ -41,6 +44,8 @@ static const char *log_level_name[LOGL_COUNT] = {
 	"IO",
 };

+_Static_assert(ARRAY_SIZE(log_level_name) == LOGL_COUNT, "log_level_name size");
+
 const char *log_get_cat_name(enum log_category_t cat)
 {
 	const char *name;
--
2.28.0