drivers/misc: Add NULL check in aspeed_lpc_enable_snoop
PATCH v3 1/1 drivers/misc: Add NULL check in aspeed_lpc_enable_snoop
devm_kasprintf() returns NULL when memory allocation fails. Currently, aspeed_lpc_enable_snoop() does not check for this case, which results in a NULL pointer dereference.
Add NULL check after devm_kasprintf() to prevent this issue.
---
V2 -> V3: Simplify the arrary access and correct commit message. V1 -> V2: Removed blank line between tags.
drivers/soc/aspeed/aspeed-lpc-snoop.c | 35 ++++++++++++++++++--------- 1 file changed, 24 insertions(+), 11 deletions(-)
drivers/soc/aspeed/aspeed-lpc-snoop.c +24 -11
@@ -189,22 +189,28 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,u32 hicr5_en, snpwadr_mask, snpwadr_shift, hicrb_en;const struct aspeed_lpc_snoop_model_data *model_data =of_device_get_match_data (dev); +struct aspeed_lpc_snoop_channel *snoop_chan = &lpc_snoop->chan[channel]; +struct miscdevice *mdev = &snoop_chan->miscdev; + +init_waitqueue_head (&snoop_chan->wq); -init_waitqueue_head (&lpc_snoop->chan[channel].wq);/* Create FIFO datastructure */ - rc =kfifo_alloc (&lpc_snoop->chan[channel].fifo, -SNOOP_FIFO_SIZE ,GFP_KERNEL ); + rc =kfifo_alloc (&snoop_chan->fifo,SNOOP_FIFO_SIZE ,GFP_KERNEL );if (rc)return rc; - 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); - lpc_snoop->chan[channel].miscdev.fops = &snoop_fops; - lpc_snoop->chan[channel].miscdev.parent = dev; - rc =misc_register (&lpc_snoop->chan[channel].miscdev); + mdev->minor =MISC_DYNAMIC_MINOR ; + mdev->name =devm_kasprintf (dev,GFP_KERNEL ,"%s%d" ,DEVICE_NAME , channel); +if (!mdev->name) { + rc = -ENOMEM ; + goto err_free_fifo; + } + + mdev->fops = &snoop_fops; + mdev->parent = dev; + rc =misc_register (mdev);if (rc) -return rc; + goto err_free_fifo;/* Enable LPC snoop channel at requested port */ switch (channel) {
@@ -221,7 +227,8 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop, hicrb_en =HICRB_ENSNP1D ;break ;default : -return -EINVAL ; + rc = -EINVAL ; + goto err_misc_deregister; }regmap_update_bits (lpc_snoop->regmap,HICR5 , hicr5_en, hicr5_en);
@@ -232,6 +239,12 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop, hicrb_en, hicrb_en);return rc; + +err_misc_deregister: +misc_deregister (mdev); +err_free_fifo: +kfifo_free (&snoop_chan->fifo); +return rc; } static void aspeed_lpc_disable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
Signature · 1 line
2.34.1
Quoted 1 line
devm_kasprintf()return NULL if memory allocation fails. Currently,
…
call? failed?
Quoted 1 line
Add NULL check after
devm_kasprintf()to prevent this issue.
Do you propose to improve this function implementation a bit more?
…
Quoted 2 lines
---
V2 -> V3: Simplify the arrary access and correct commit message.
…
* Would you like to avoid a typo here?
* I imagine that there is a need to offer such adjustments in separate update steps.
https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.14#n81
* Please choose a more appropriate subsystem specification.
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
* How do you think about to append parentheses to a function name also in the summary phrase?
Regards,
Markus
…
Quoted 2 lines
---
V2 -> V3: Simplify …
Is there a need to reconsider patch version numbers a bit more?
Regards,
Markus