| From dd7eba9bb8c880d29c50af1bc2c42cce10d78be1 Mon Sep 17 00:00:00 2001 |
| From: Alexey Khoroshilov <khoroshilov@ispras.ru> |
| Date: Fri, 23 Nov 2018 16:56:26 -0500 |
| Subject: media: DaVinci-VPBE: fix error handling in vpbe_initialize() |
| |
| [ Upstream commit aa35dc3c71950e3fec3e230c06c27c0fbd0067f8 ] |
| |
| If vpbe_set_default_output() or vpbe_set_default_mode() fails, |
| vpbe_initialize() returns error code without releasing resources. |
| |
| The patch adds error handling for that case. |
| |
| Found by Linux Driver Verification project (linuxtesting.org). |
| |
| Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/davinci/vpbe.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c |
| index 7f6462562579..1d3c13e36904 100644 |
| --- a/drivers/media/platform/davinci/vpbe.c |
| +++ b/drivers/media/platform/davinci/vpbe.c |
| @@ -739,7 +739,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev) |
| if (ret) { |
| v4l2_err(&vpbe_dev->v4l2_dev, "Failed to set default output %s", |
| def_output); |
| - return ret; |
| + goto fail_kfree_amp; |
| } |
| |
| printk(KERN_NOTICE "Setting default mode to %s\n", def_mode); |
| @@ -747,12 +747,15 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev) |
| if (ret) { |
| v4l2_err(&vpbe_dev->v4l2_dev, "Failed to set default mode %s", |
| def_mode); |
| - return ret; |
| + goto fail_kfree_amp; |
| } |
| vpbe_dev->initialized = 1; |
| /* TBD handling of bootargs for default output and mode */ |
| return 0; |
| |
| +fail_kfree_amp: |
| + mutex_lock(&vpbe_dev->lock); |
| + kfree(vpbe_dev->amp); |
| fail_kfree_encoders: |
| kfree(vpbe_dev->encoders); |
| fail_dev_unregister: |
| -- |
| 2.19.1 |
| |