| Message ID | 145856703865.21117.13877102672522214541.stgit@woodpecker.blarg.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Em Mon, 21 Mar 2016 14:30:38 +0100 Max Kellermann <max@duempel.org> escreveu: > Allow the client to free its data structures only after all files have > been closed (fixing use-after-free bugs). Hmm... Shuah is also working on fixing such issues at the media controller stuff, and I made a few fix patches myself. Our work is at: https://git.linuxtv.org/mchehab/experimental.git/log/?h=media_cdev_fix Please base your changes on it, to avoid conflicting work or rework. I just rebased it on the top of media_tree (plus the patches for it that I didn't push yet). Thanks! Mauro > > Signed-off-by: Max Kellermann <max@duempel.org> > --- > drivers/media/media-device.c | 9 +++++++-- > include/media/media-device.h | 2 ++ > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c > index 5c4669c..a3901f9 100644 > --- a/drivers/media/media-device.c > +++ b/drivers/media/media-device.c > @@ -551,9 +551,14 @@ static DEVICE_ATTR(model, S_IRUGO, show_model, NULL); > * Registration/unregistration > */ > > -static void media_device_release(struct media_devnode *mdev) > +static void media_device_release(struct media_devnode *devnode) > { > - dev_dbg(mdev->parent, "Media device released\n"); > + struct media_device *mdev = to_media_device(devnode); > + > + dev_dbg(devnode->parent, "Media device released\n"); > + > + if (mdev->release) > + mdev->release(mdev); > } > > /** > diff --git a/include/media/media-device.h b/include/media/media-device.h > index d385589..d184d0c 100644 > --- a/include/media/media-device.h > +++ b/include/media/media-device.h > @@ -326,6 +326,8 @@ struct media_device { > > int (*link_notify)(struct media_link *link, u32 flags, > unsigned int notification); > + > + void (*release)(struct media_device *mdev); > }; > > #ifdef CONFIG_MEDIA_CONTROLLER > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 5c4669c..a3901f9 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -551,9 +551,14 @@ static DEVICE_ATTR(model, S_IRUGO, show_model, NULL); * Registration/unregistration */ -static void media_device_release(struct media_devnode *mdev) +static void media_device_release(struct media_devnode *devnode) { - dev_dbg(mdev->parent, "Media device released\n"); + struct media_device *mdev = to_media_device(devnode); + + dev_dbg(devnode->parent, "Media device released\n"); + + if (mdev->release) + mdev->release(mdev); } /** diff --git a/include/media/media-device.h b/include/media/media-device.h index d385589..d184d0c 100644 --- a/include/media/media-device.h +++ b/include/media/media-device.h @@ -326,6 +326,8 @@ struct media_device { int (*link_notify)(struct media_link *link, u32 flags, unsigned int notification); + + void (*release)(struct media_device *mdev); }; #ifdef CONFIG_MEDIA_CONTROLLER
Allow the client to free its data structures only after all files have been closed (fixing use-after-free bugs). Signed-off-by: Max Kellermann <max@duempel.org> --- drivers/media/media-device.c | 9 +++++++-- include/media/media-device.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html