[PATCH] media: lm3560: prevent memory leak of v4l2_ctrl_handler

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



If lm3560_subdev_init() or lm3560_init_device() failed, lm3560_probe() will
directly return without free v4l2_ctrl_handler, which results memory leak:

unreferenced object 0xffff8881ea566e00 (size 256):
  comm "xrun", pid 396, jiffies 4294949372 (age 80.376s)
  hex dump (first 32 bytes):
    d8 82 81 4d 81 88 ff ff 00 4c 56 ea 81 88 ff ff  ...M.....LV.....
    10 6e 56 ea 81 88 ff ff 10 6e 56 ea 81 88 ff ff  .nV......nV.....
  backtrace:
    [<0000000055d4bb48>] __kmalloc_node+0x198/0x330
    [<00000000e3b57405>] kvmalloc_node+0x65/0x130
    [<0000000061e6063e>] v4l2_ctrl_new+0x820/0x1d40 [videodev]
    [<00000000d7174c1b>] v4l2_ctrl_new_std+0x1d5/0x2b0 [videodev]
    [<00000000cefb1a26>] lm3560_subdev_init+0x374/0x5e0 [lm3560]
    [<00000000cda4c495>] lm3560_probe+0x1c2/0x61a [lm3560]
    [<00000000d9502788>] i2c_device_probe+0xa07/0xbb0
    [<00000000a5e908d0>] really_probe+0x285/0xc30
    [<000000002fee9400>] __driver_probe_device+0x35f/0x4f0
    [<0000000025fd5e96>] driver_probe_device+0x4f/0x140
    [<00000000d37732ef>] __device_attach_driver+0x24c/0x330
    [<000000001e0f0dfd>] bus_for_each_drv+0x15d/0x1e0
    [<00000000c6c72d57>] __device_attach+0x267/0x410
    [<000000005f7e4b8c>] bus_probe_device+0x1ec/0x2a0
    [<000000001c3d09f6>] device_add+0xc1c/0x1d50
    [<00000000cddb870a>] i2c_new_client_device+0x614/0xb00

Fixes: 7f6b11a18c30 ("[media] media: i2c: add driver for dual LED Flash, lm3560")
Reported-by: Hulk Robot <hulkci@xxxxxxxxxx>
Signed-off-by: Liu Shixin <liushixin2@xxxxxxxxxx>
---
 drivers/media/i2c/lm3560.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/lm3560.c b/drivers/media/i2c/lm3560.c
index 9e34ccce4fc3..8d2e224c725b 100644
--- a/drivers/media/i2c/lm3560.c
+++ b/drivers/media/i2c/lm3560.c
@@ -432,15 +432,22 @@ static int lm3560_probe(struct i2c_client *client,
 
 	rval = lm3560_subdev_init(flash, LM3560_LED1, "lm3560-led1");
 	if (rval < 0)
-		return rval;
+		goto free_led0;
 
 	rval = lm3560_init_device(flash);
 	if (rval < 0)
-		return rval;
+		goto free_led1;
 
 	i2c_set_clientdata(client, flash);
 
 	return 0;
+
+free_led1:
+	v4l2_ctrl_handler_free(&flash->ctrls_led[LM3560_LED1]);
+free_led0:
+	v4l2_ctrl_handler_free(&flash->ctrls_led[LM3560_LED0]);
+
+	return rval;
 }
 
 static int lm3560_remove(struct i2c_client *client)
-- 
2.25.1




[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]

  Powered by Linux