projects/linux·commit e4fcd69c

Merge branch 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus

e4fcd69c · Linus Torvalds <[email protected]> · 2011-10-19 06:44:11 -07:00

* 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus:
  [media] videodev: fix a NULL pointer dereference in v4l2_device_release()
Commit
e4fcd69c9e4e273352e0f87cabd9648606da0c3e
Parents
f91f6cfd · e58fced2

Merge commit. Changes below are compared with the first parent: f91f6cfd.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/media/video/v4l2-dev.cmodified+1−1View file

drivers/media/video/v4l2-dev.c

View file
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index d721565..a5c9ed1 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -181,7 +181,7 @@ static void v4l2_device_release(struct device *cd)
* TODO: In the long run all drivers that use v4l2_device should use the
* v4l2_device release callback. This check will then be unnecessary.
*/
- if (v4l2_dev->release == NULL)
+ if (v4l2_dev && v4l2_dev->release == NULL)
v4l2_dev = NULL;
/* Release video_device and perform other