Skip to contentSkip to conversation

dm: dump.c: Fix segfault when entry->of_match is NULL

PATCH New Ovidiu Panait 4 participants 8 messages Apr 5, 2020 – Apr 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 dm: dump.c: Fix segfault when entry->of_match is NULL

Currently, dm drivers command produces a segfault:
=> dm drivers
Driver Compatible
--------------------------------
Segmentation fault (core dumped)

This is caused by a NULL pointer dereference of entry->of_match. Add a check to prevent this.

Cc Sean Anderson <[email protected]>
Cc Simon Glass <[email protected]>
---
 drivers/core/dump.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/core/dump.c +2 -1
index e73ebeabcc..b5046398d4 100644
@@ -107,7 +107,8 @@ void dm_dump_drivers(void)
 	puts("Driver                Compatible\n");
 	puts("--------------------------------\n");
 	for (entry = d; entry < d + n_ents; entry++) {
-		for (match = entry->of_match; match->compatible; match++)
+		for (match = entry->of_match;
+		     match && match->compatible; match++)
 			printf("%-20.20s  %s\n",
 			       match == entry->of_match ? entry->name : "",
 			       match->compatible);
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 dm: dump.c: Refactor dm_dump_drivers prints

Refactor the printing sequence in dm_dump_drivers to make it more clear.

Cc Sean Anderson <[email protected]>
Cc Simon Glass <[email protected]>
---
 drivers/core/dump.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/core/dump.c +11 -7
index b5046398d4..cb8a25b9ad 100644
@@ -107,12 +107,16 @@ void dm_dump_drivers(void)
 	puts("Driver                Compatible\n");
 	puts("--------------------------------\n");
 	for (entry = d; entry < d + n_ents; entry++) {
-		for (match = entry->of_match;
-		     match && match->compatible; match++)
-			printf("%-20.20s  %s\n",
-			       match == entry->of_match ? entry->name : "",
-			       match->compatible);
-		if (match == entry->of_match)
-			printf("%-20.20s\n", entry->name);
+		match = entry->of_match;
+
+		printf("%-20.20s", entry->name);
+		if (match) {
+			printf("  %s", match->compatible);
+			match++;
+		}
+		printf("\n");
+
+		for (; match && match->compatible; match++)
+			printf("%-20.20s  %s\n", "", match->compatible);
 	}
 }
Signature · 1 line
2.17.1
#3 lore raw

PATCH 2/2 dm: dump.c: Refactor dm_dump_drivers prints

Quoted 10 lines · Ovidiu Panait

Refactor the printing sequence in dm_dump_drivers to make it more clear.

Cc Sean Anderson <[email protected]>
Cc Simon Glass <[email protected]>
---
 drivers/core/dump.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Applied to u-boot-dm, thanks!

#4 lore raw

PATCH 1/2 dm: dump.c: Fix segfault when entry->of_match is NULL

In reply to Ovidiu Panait
Quoted 8 lines · Ovidiu Panait

Currently, dm drivers command produces a segfault:
=> dm drivers
Driver Compatible
--------------------------------
Segmentation fault (core dumped)

This is caused by a NULL pointer dereference of entry->of_match. Add a check to prevent this.

This should have been fixed in version 3 of the original patch [1]. Did it not get merged properly? This is the second time I've been CC'd by someone who wants to fix this.

[1] https://patchwork.ozlabs.org/patch/1234460/

--Sean

#5 lore raw

PATCH 1/2 dm: dump.c: Fix segfault when entry->of_match is NULL

Quoted 7 lines · Sean Anderson
Quoted 6 lines · Ovidiu Panait

Currently, dm drivers command produces a segfault:
=> dm drivers
Driver Compatible
--------------------------------
Segmentation fault (core dumped)

Quoted 7 lines
Quoted 2 lines

This is caused by a NULL pointer dereference of entry->of_match. Add a check to prevent this.

This should have been fixed in version 3 of the original patch [1]. Did it not get merged properly? This is the second time I've been CC'd by someone who wants to fix this.

[1] https://patchwork.ozlabs.org/patch/1234460/

Yes, it seems that an older version of the patch was merged:

https://github.com/u-boot/u-boot/commit/7b9d60fc1ff67b3959a7db394084b27268a7686d

Ovidiu

Quoted 1 line

--Sean

#6 lore raw

PATCH 1/2 dm: dump.c: Fix segfault when entry->of_match is NULL

Hi,

Quoted 16 lines · Ovidiu Panait
Quoted 13 lines · Sean Anderson
Quoted 8 lines · Ovidiu Panait

Currently, dm drivers command produces a segfault:
=> dm drivers
Driver Compatible
--------------------------------
Segmentation fault (core dumped)

This is caused by a NULL pointer dereference of entry->of_match. Add a check to prevent this.

This should have been fixed in version 3 of the original patch [1]. Did it not get merged properly? This is the second time I've been CC'd by someone who wants to fix this.

Quoted 5 lines
Quoted 1 line

[1] https://patchwork.ozlabs.org/patch/1234460/

Yes, it seems that an older version of the patch was merged:

https://github.com/u-boot/u-boot/commit/7b9d60fc1ff67b3959a7db394084b27268a7686d

OK, so can someone do a fixup patch for this?

Regards,
Simon

#7 lore raw

PATCH 1/2 dm: dump.c: Fix segfault when entry->of_match is NULL

Hi,

Quoted 16 lines · Ovidiu Panait
Quoted 13 lines · Sean Anderson
Quoted 8 lines · Ovidiu Panait

Currently, dm drivers command produces a segfault:
=> dm drivers
Driver Compatible
--------------------------------
Segmentation fault (core dumped)

This is caused by a NULL pointer dereference of entry->of_match. Add a check to prevent this.

This should have been fixed in version 3 of the original patch [1]. Did it not get merged properly? This is the second time I've been CC'd by someone who wants to fix this.

Quoted 5 lines
Quoted 1 line

[1] https://patchwork.ozlabs.org/patch/1234460/

Yes, it seems that an older version of the patch was merged:

https://github.com/u-boot/u-boot/commit/7b9d60fc1ff67b3959a7db394084b27268a7686d

OK, so can someone do a fixup patch for this?

Regards,
Simon

Applied to u-boot-dm, thanks!