Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3de4414e798795ef5d719622dbf12bbe27a9e72e

Authored by Dave Jones
Committed by Jaroslav Kysela
1 parent bcc54f9a56
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[ALSA] ad1848 double free 

Modules: AD1848 driver

Same again, snd_ctl_add() already kfree's on error.

Coverity #956

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff

sound/isa/ad1848/ad1848_lib.c
Diff comments   View file @ 3de4414
... ... @@ -1202,10 +1202,8 @@
1202 1202 strlcpy(ctl->id.name, name, sizeof(ctl->id.name));
1203 1203 ctl->id.index = index;
1204 1204 ctl->private_value = value;
1205   - if ((err = snd_ctl_add(chip->card, ctl)) < 0) {
1206   - snd_ctl_free_one(ctl);
  1205 + if ((err = snd_ctl_add(chip->card, ctl)) < 0)
1207 1206 return err;
1208   - }
1209 1207 return 0;
1210 1208 }
1211 1209