From 5f21d67472ad08c1e96b4385254adba79aa1c467 Mon Sep 17 00:00:00 2001 From: Mariusz Tkaczyk Date: Thu, 20 Jan 2022 13:18:33 +0100 Subject: mdadm: add map_num_s() map_num() returns NULL if key is not defined. This patch adds alternative, non NULL version for cases where NULL is not expected. There are many printf() calls where map_num() is called on variable without NULL verification. It works, even if NULL is passed because gcc is able to ignore NULL argument quietly but the behavior is undefined. For safety reasons such usages will use map_num_s() now. It is a potential point of regression. Signed-off-by: Mariusz Tkaczyk Signed-off-by: Jes Sorensen --- super1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'super1.c') diff --git a/super1.c b/super1.c index a12a5bc..e3e2f95 100644 --- a/super1.c +++ b/super1.c @@ -671,7 +671,7 @@ static void export_examine_super1(struct supertype *st) int len = 32; int layout; - printf("MD_LEVEL=%s\n", map_num(pers, __le32_to_cpu(sb->level))); + printf("MD_LEVEL=%s\n", map_num_s(pers, __le32_to_cpu(sb->level))); printf("MD_DEVICES=%d\n", __le32_to_cpu(sb->raid_disks)); for (i = 0; i < 32; i++) if (sb->set_name[i] == '\n' || sb->set_name[i] == '\0') { -- cgit v1.2.1