From: Mark Balantzyan <mbalant3@gmail.com>
To: ezequiel@vanguardiasur.com.ar
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] media input infrastructure:tw686x: Fix of possibleinconsistent memory deallocation and/or race condition by implementation of custom video_device_release function in tw686x driver
Date: Mon, 29 Jul 2019 13:09:09 -0700 (PDT) [thread overview]
Message-ID: <alpine.DEB.2.21.1907291256080.16959@mbalantz-desktop> (raw)
Possible inconsistent memory deallocation and/or race conditions were
detected specifically with respect to remaining open handles to the video
device handled by the tw686x driver. This patch addresses this by
implementing a revised independent instance of the video_device_release
function to free the remaining resources and memory where the last open
handle(s) is/were closed.
Signed-off-by: Mark Balantzyan <mbalant3@gmail.com>
---
drivers/media/pci/tw686x/tw686x-video.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/media/pci/tw686x/tw686x-video.c
b/drivers/media/pci/tw686x/tw686x-video.c
index 3a06c000..29e10c85 100644
--- a/drivers/media/pci/tw686x/tw686x-video.c
+++ b/drivers/media/pci/tw686x/tw686x-video.c
@@ -1151,18 +1151,25 @@ void tw686x_video_irq(struct tw686x_dev *dev,
unsigned long requests,
}
}
+void video_device_release(tw686x_dev *dev) {
+ for (int pb = 0; pb < 2; pb++) {
+ dev->dma_ops->free(dev->video_channels,pb);
+ }
+ kfree(dev);
+}
+
void tw686x_video_free(struct tw686x_dev *dev)
{
- unsigned int ch, pb;
+ unsigned int ch;
for (ch = 0; ch < max_channels(dev); ch++) {
struct tw686x_video_channel *vc =
&dev->video_channels[ch];
video_unregister_device(vc->device);
- if (dev->dma_ops->free)
- for (pb = 0; pb < 2; pb++)
- dev->dma_ops->free(vc, pb);
+ if (dev->dma_ops->free) {
+ video_device_release(dev);
+ }
}
}
--
2.17.1
next reply other threads:[~2019-07-29 20:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-29 20:09 Mark Balantzyan [this message]
2019-07-30 8:15 ` [PATCH] media input infrastructure:tw686x: Fix of possibleinconsistent memory deallocation and/or race condition by implementation of custom video_device_release function in tw686x driver Hans Verkuil
2019-07-31 21:32 ` Mark Balantzyan
2019-08-03 12:24 ` [PATCH] media input infrastructure:tw686x Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.21.1907291256080.16959@mbalantz-desktop \
--to=mbalant3@gmail.com \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox