diff options
author | Shailendra Verma | 2016-11-25 05:57:34 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2019-07-26 09:14:02 +0200 |
commit | ef10d46d04a5353a6e066974374fb95584fbee91 (patch) | |
tree | e3cebe6a0d68bc9791653bd2e1b9d2c23ffb9a26 /drivers/staging | |
parent | media: saa7164: fix remove_proc_entry warning (diff) | |
download | kernel-qcow2-linux-ef10d46d04a5353a6e066974374fb95584fbee91.tar.gz kernel-qcow2-linux-ef10d46d04a5353a6e066974374fb95584fbee91.tar.xz kernel-qcow2-linux-ef10d46d04a5353a6e066974374fb95584fbee91.zip |
media: staging: media: davinci_vpfe: - Fix for memory leak if decoder initialization fails.
[ Upstream commit 6995a659101bd4effa41cebb067f9dc18d77520d ]
Fix to avoid possible memory leak if the decoder initialization
got failed.Free the allocated memory for file handle object
before return in case decoder initialization fails.
Signed-off-by: Shailendra Verma <shailendra.v@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/media/davinci_vpfe/vpfe_video.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 1269a983455e..13b890b9ef18 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c @@ -422,6 +422,9 @@ static int vpfe_open(struct file *file) /* If decoder is not initialized. initialize it */ if (!video->initialized && vpfe_update_pipe_state(video)) { mutex_unlock(&video->lock); + v4l2_fh_del(&handle->vfh); + v4l2_fh_exit(&handle->vfh); + kfree(handle); return -ENODEV; } /* Increment device users counter */ |