Skip to contentSkip to conversation

Media: Radio: Change devm_k*alloc to k*alloc

PATCH Superseded lnowakow at eng.ucsd.edu (Luke Nowakowski-Krijger) 3 participants 5 messages Jun 18, 2019 – Jun 21, 2019

Subsystems (2)
lore
Share & tools
lore

lnowakow at eng.ucsd.edu (Luke Nowakowski-Krijger)

#0 lore raw

PATCH v4 1/1 Media: Radio: Change devm_k*alloc to k*alloc

Change devm_k*alloc to k*alloc to manually allocate memory.

Memory is freed in v4l2.release callback which now calls raremono_device_release to free up the appropriate memory, just like in radio-shark driver.

Reported-by syzbot+a4387f5b6b799f6becbf at syzkaller.appspotmail.com
Signed-off-by Luke Nowakowski-Krijger <lnowakow at eng.ucsd.edu>

---

drivers/media/radio/radio-raremono.c +23 -10
index 5e782b3c2fa9..ba471dd015f8 100644
@@ -271,6 +271,14 @@ static int vidioc_g_frequency(struct file *file, void *priv,
        return 0;
 }
 
+static void raremono_device_release(struct v4l2_device *v4l2_dev)
+{
+       struct raremono_device *radio = to_raremono_dev(v4l2_dev);
+       kfree(radio->buffer);
+       kfree(radio);
+}
+
+
 /* File system interface */
 static const struct v4l2_file_operations usb_raremono_fops = {
        .owner          = THIS_MODULE,
@@ -295,12 +303,14 @@ static int usb_raremono_probe(struct usb_interface *intf,
        struct raremono_device *radio;
        int retval = 0;
 
-       radio = devm_kzalloc(&intf->dev, sizeof(struct raremono_device), GFP_KERNEL);
-       if (radio)
-               radio->buffer = devm_kmalloc(&intf->dev, BUFFER_LENGTH, GFP_KERNEL);
-
-       if (!radio || !radio->buffer)
+       radio = kzalloc(sizeof(struct raremono_device), GFP_KERNEL);
+       if (!radio)
+               return -ENOMEM;
+       radio->buffer = kmalloc(BUFFER_LENGTH, GFP_KERNEL);
+       if (!radio->buffer) {
+               kfree(radio);
                return -ENOMEM;
+       }
 
        radio->usbdev = interface_to_usbdev(intf);
        radio->intf = intf;
@@ -324,16 +334,16 @@ static int usb_raremono_probe(struct usb_interface *intf,
        if (retval != 3 ||
            (get_unaligned_be16(&radio->buffer[1]) & 0xfff) == 0x0242) {
                dev_info(&intf->dev, "this is not Thanko's Raremono.\n");
-               return -ENODEV;
+               retval = -ENODEV;
+               goto free_mem;
        }
-
        dev_info(&intf->dev, "Thanko's Raremono connected: (%04X:%04X)\n",
                        id->idVendor, id->idProduct);
 
        retval = v4l2_device_register(&intf->dev, &radio->v4l2_dev);
        if (retval < 0) {
       		dev_err(&intf->dev, "couldn't register v4l2_device\n");
-               return retval;
+               goto free_mem;
        }
 
        mutex_init(&radio->lock);
@@ -345,11 +355,10 @@ static int usb_raremono_probe(struct usb_interface *intf,
        radio->vdev.ioctl_ops = &usb_raremono_ioctl_ops;
        radio->vdev.lock = &radio->lock;
        radio->vdev.release = video_device_release_empty;
+       radio->v4l2_dev.release = raremono_device_release;
 
        usb_set_intfdata(intf, &radio->v4l2_dev);
-
        video_set_drvdata(&radio->vdev, radio);
-
        raremono_cmd_main(radio, BAND_FM, 95160);
 
        retval = video_register_device(&radio->vdev, VFL_TYPE_RADIO, -1);
@@ -360,6 +369,10 @@ static int usb_raremono_probe(struct usb_interface *intf,
        }
        dev_err(&intf->dev, "could not register video device\n");
        v4l2_device_unregister(&radio->v4l2_dev);
+
+free_mem:
+       kfree(radio->buffer);
+       kfree(radio);
        return retval;
 }
#1 lore raw

PATCH v4 1/1 Media: Radio: Change devm_k*alloc to k*alloc

Quoted 5 lines · Luke Nowakowski-Krijger

Change devm_k*alloc to k*alloc to manually allocate memory.

Memory is freed in v4l2.release callback which now calls raremono_device_release to free up the appropriate memory, just like in radio-shark driver.

Trailing whitespace :(

Please fix your editor.

Quoted 5 lines
Reported-by syzbot+a4387f5b6b799f6becbf at syzkaller.appspotmail.com
Signed-off-by Luke Nowakowski-Krijger <lnowakow at eng.ucsd.edu>

---

If this is a new version, properly version your patches, with a v2 and a description below the --- line as to what changed. The documentation should say exactly how to do this.

Also, did you submit this to syzbot for testing? You can do that through the email interface.

thanks,

greg k-h

#2 lore raw

PATCH v4 1/1 Media: Radio: Change devm_k*alloc to k*alloc

Quoted 21 lines · Greg KH
Quoted 5 lines · Luke Nowakowski-Krijger

Change devm_k*alloc to k*alloc to manually allocate memory.

Memory is freed in v4l2.release callback which now calls raremono_device_release to free up the appropriate memory, just like in radio-shark driver.

Trailing whitespace :(

Please fix your editor.

Quoted 5 lines
Reported-by syzbot+a4387f5b6b799f6becbf at syzkaller.appspotmail.com
Signed-off-by Luke Nowakowski-Krijger <lnowakow at eng.ucsd.edu>

---

If this is a new version, properly version your patches, with a v2 and a description below the --- line as to what changed. The documentation should say exactly how to do this.

Quoted 6 lines

Also, did you submit this to syzbot for testing? You can do that through the email interface.

thanks,

greg k-h

Luke,

Once you fix all the issues, please include media mailing list and everybody get_maintainers.pl suggests and Hans Verkuil as well.

thanks,
-- Shuah

#3 lore raw

PATCH v4 1/1 Media: Radio: Change devm_k*alloc to k*alloc

In reply to gregkh at linuxfoundation.org (Greg KH)
Quoted 21 lines · Greg KH
Quoted 5 lines · Luke Nowakowski-Krijger

Change devm_k*alloc to k*alloc to manually allocate memory.

Memory is freed in v4l2.release callback which now calls raremono_device_release to free up the appropriate memory, just like in radio-shark driver.

Trailing whitespace :(

Please fix your editor.

Quoted 5 lines
Reported-by syzbot+a4387f5b6b799f6becbf at syzkaller.appspotmail.com
Signed-off-by Luke Nowakowski-Krijger <lnowakow at eng.ucsd.edu>

---

If this is a new version, properly version your patches, with a v2 and a description below the --- line as to what changed. The documentation should say exactly how to do this.

Quoted 6 lines

Also, did you submit this to syzbot for testing? You can do that through the email interface.

thanks,

greg k-h

Hi Greg,

I sent the patch through the email interface and tested it. It did not trigger the bug. Do I put the "tested-and-reporteed by" tag instead? Or do I just mention testing methods and results?

Thanks
- Luke Nowakowski-Krijger

#4 lore raw

PATCH v4 1/1 Media: Radio: Change devm_k*alloc to k*alloc

Quoted 27 lines · Luke Nowakowski-Krijger
Quoted 26 lines · Greg KH
Quoted 5 lines · Luke Nowakowski-Krijger

Change devm_k*alloc to k*alloc to manually allocate memory.

Memory is freed in v4l2.release callback which now calls raremono_device_release to free up the appropriate memory, just like in radio-shark driver.

Trailing whitespace :(

Please fix your editor.

Quoted 5 lines
Reported-by syzbot+a4387f5b6b799f6becbf at syzkaller.appspotmail.com
Signed-off-by Luke Nowakowski-Krijger <lnowakow at eng.ucsd.edu>

---

If this is a new version, properly version your patches, with a v2 and a description below the --- line as to what changed. The documentation should say exactly how to do this.

Also, did you submit this to syzbot for testing? You can do that through the email interface.

thanks,

Quoted 7 lines
Quoted 1 line

greg k-h

Hi Greg,

I sent the patch through the email interface and tested it. It did not trigger the bug. Do I put the "tested-and-reporteed by" tag instead? Or do I just mention testing methods and results?

tested and reported by is correct. We want to see that this has been tested :)

thanks,

greg k-h