Skip to contentSkip to conversation

drivers/misc: Add NULL check in aspeed_lpc_enable_snoop

PATCH Superseded Henry Martin 2 participants 2 messages Mar 31, 2025 Arm/Aspeed machine support

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drivers/misc: Add NULL check in aspeed_lpc_enable_snoop

devm_kasprintf() returns NULL if memory allocation fails. Currently, aspeed_lpc_enable_snoop() does not check for this case, leading to a NULL pointer dereference.

Add NULL check after devm_kasprintf() to prevent this issue.

Fixes 3772e5da4454 ("drivers/misc: Aspeed LPC snoop output using misc chardev")

---
V1 -> V2: Removed blank line between tags.

---
 drivers/soc/aspeed/aspeed-lpc-snoop.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/soc/aspeed/aspeed-lpc-snoop.c +2 -0
index 9ab5ba9cf1d6..376b3a910797 100644
@@ -200,6 +200,8 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
 	lpc_snoop->chan[channel].miscdev.minor = MISC_DYNAMIC_MINOR;
 	lpc_snoop->chan[channel].miscdev.name =
 		devm_kasprintf(dev, GFP_KERNEL, "%s%d", DEVICE_NAME, channel);
+	if (!lpc_snoop->chan[channel].miscdev.name)
+		return -ENOMEM;
 	lpc_snoop->chan[channel].miscdev.fops = &snoop_fops;
 	lpc_snoop->chan[channel].miscdev.parent = dev;
 	rc = misc_register(&lpc_snoop->chan[channel].miscdev);
Signature · 1 line
2.34.1
#1 lore raw
Quoted 1 line

devm_kasprintf() returns NULL if memory allocation fails. Currently,

…
call? failed?

An other subsystem specification might be more desirable.
https://web.git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/drivers/soc/aspeed/aspeed-lpc-snoop.c?h=next-20250331

…

drivers/soc/aspeed/aspeed-lpc-snoop.c static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop, · line 204

Quoted 7 lines

+++ b/drivers/soc/aspeed/aspeed-lpc-snoop.c

drivers/soc/aspeed/aspeed-lpc-snoop.c +2 -0
@@ -200,6 +200,8 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
 	lpc_snoop->chan[channel].miscdev.minor = MISC_DYNAMIC_MINOR;
 	lpc_snoop->chan[channel].miscdev.name =
 		devm_kasprintf(dev, GFP_KERNEL, "%s%d", DEVICE_NAME, channel);
+	if (!lpc_snoop->chan[channel].miscdev.name)
+		return -ENOMEM;

…

Can a blank line be preferred after such a statement?

* May the array access be simplified another bit here?
* How do you think about to store a pointer to a corresponding data structure member in an additional local variable?

Regards,
Markus