[PATCH] ALSA: jack: Check the return value of kstrdup()

[PATCH] ALSA: jack: Check the return value of kstrdup()

[xkernel]

kstrdup() can return NULL, it is better to check the return value of it.

Signed-off-by: xkernel <xkernel.wang@foxmail.com>
---
 sound/core/jack.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/core/jack.c b/sound/core/jack.c
index 32350c6..5fd9954 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -509,6 +509,8 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
 		return -ENOMEM;
 
 	jack->id = kstrdup(id, GFP_KERNEL);
+	if (jack->id == NULL)
+		return -ENOMEM;
 
 	/* don't creat input device for phantom jack */
 	if (!phantom_jack) {
-- 

Re: [PATCH] ALSA: jack: Check the return value of kstrdup()

[Joe Perches]

On Sun, 2021-12-12 at 01:13 +0800, xkernel wrote:
> kstrdup() can return NULL, it is better to check the return value of it.
[]
> diff --git a/sound/core/jack.c b/sound/core/jack.c
[]
> @@ -509,6 +509,8 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
>  		return -ENOMEM;
>  
>  	jack->id = kstrdup(id, GFP_KERNEL);
> +	if (jack->id == NULL)
> +		return -ENOMEM;

jack should be freed too.

	if (!jack->id) {
		kfree(jack);
		return -ENOMEM;
	}

>  
>  	/* don't creat input device for phantom jack */
>  	if (!phantom_jack) {

Re: [PATCH] ALSA: jack: Check the return value of kstrdup()

[Takashi Iwai]

On Mon, 13 Dec 2021 08:39:31 +0100,
Xiaoke Wang wrote:
> 
> kstrdup() can return NULL, it is better to check the return value of it.
> Fix: free jack and use my full name.
> 
> Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>

Thanks, applied now with Cc-to-stable.

BTW, when you submit a revised patch, please put 'v2' or such to the
patch subject prefix, e.g.
  [PATCH v2] ALSA: jack: ...

Also you can put the note about the changes between revisions as

  v1->v2: Fix something more....

and this could be put after the first '---' line (around the diffstat)
if it's not necessarily to be included in the final commit log.


Takashi

Re: [PATCH] ALSA: jack: Check the return value of kstrdup()

[Xiaoke Wang]

kstrdup() can return NULL, it is better to check the return value of it.
Fix: free jack and use my full name.

Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
---
 sound/core/jack.c | 4 ++
 1 file changed, 4 insertions(+)

diff --git a/sound/core/jack.c b/sound/core/jack.c
index 32350c6..5fd9954 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -509,6 +509,10 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
 		return -ENOMEM;
 
 	jack->id = kstrdup(id, GFP_KERNEL);
+	if (jack->id == NULL) {
+		kfree(jack);
+		return -ENOMEM;
+	}
 
 	/* don't creat input device for phantom jack */
 	if (!phantom_jack) {
--