From: Hao Ge <hao.ge@linux.dev>
To: Markus.Elfring@web.de, broonie@kernel.org, perex@perex.cz,
tiwai@suse.com
Cc: shenghao-ding@ti.com, colin.i.king@gmail.com, gehao618@163.com,
linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
Hao Ge <gehao@kylinos.cn>
Subject: [PATCH v2] ASoc: PCM6240: Return directly after a failed devm_kzalloc() in pcmdevice_i2c_probe()
Date: Mon, 17 Jun 2024 10:09:54 +0800 [thread overview]
Message-ID: <20240617020954.17252-1-hao.ge@linux.dev> (raw)
In-Reply-To: <82283abf-10b1-4095-a93f-112ba8aca483@web.de>
From: Hao Ge <gehao@kylinos.cn>
The value “-ENOMEM” was assigned to the local variable “ret”
in one if branch after a devm_kzalloc() call failed at the beginning.
This error code will trigger then a pcmdevice_remove() call with a passed
null pointer so that an undesirable dereference will be performed.
Thus return the appropriate error code directly.
Fixes: 1324eafd37aa ("ASoc: PCM6240: Create PCM6240 Family driver code")
Signed-off-by: Hao Ge <gehao@kylinos.cn>
---
v2:
- adjust title and commit message
- omit curly brackets
---
sound/soc/codecs/pcm6240.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/pcm6240.c b/sound/soc/codecs/pcm6240.c
index 86e126783a1d..8f7057e689fb 100644
--- a/sound/soc/codecs/pcm6240.c
+++ b/sound/soc/codecs/pcm6240.c
@@ -2087,10 +2087,8 @@ static int pcmdevice_i2c_probe(struct i2c_client *i2c)
#endif
pcm_dev = devm_kzalloc(&i2c->dev, sizeof(*pcm_dev), GFP_KERNEL);
- if (!pcm_dev) {
- ret = -ENOMEM;
- goto out;
- }
+ if (!pcm_dev)
+ return -ENOMEM;
pcm_dev->chip_id = (id != NULL) ? id->driver_data : 0;
--
2.25.1
next prev parent reply other threads:[~2024-06-17 2:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-14 2:41 [PATCH] ASoc: PCM6240: Fix a null pointer dereference in pcmdevice_i2c_probe Hao Ge
2024-06-14 20:20 ` Markus Elfring
2024-06-17 11:58 ` Mark Brown
2024-06-15 6:16 ` Markus Elfring
2024-06-17 2:09 ` Hao Ge [this message]
2024-06-23 10:50 ` [PATCH v2] ASoc: PCM6240: Return directly after a failed devm_kzalloc() in pcmdevice_i2c_probe() Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240617020954.17252-1-hao.ge@linux.dev \
--to=hao.ge@linux.dev \
--cc=Markus.Elfring@web.de \
--cc=broonie@kernel.org \
--cc=colin.i.king@gmail.com \
--cc=gehao618@163.com \
--cc=gehao@kylinos.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=shenghao-ding@ti.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.