diff options
author | Julia Lawall <julia@diku.dk> | 2008-01-11 20:03:42 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:05:02 -0500 |
commit | a2a9b1eceb50993ef9e126dffc2f678fd6602158 (patch) | |
tree | b1303c735608c5ebbe3eea800d6b2cd2ff080a9a | |
parent | bc835d80d9cd912cfa8beb6ad4549cd8160d3601 (diff) |
V4L/DVB (7035): drivers/media/common: Add missing video_device_release
Video_device_alloc returns the result of a kzalloc. In this case, the
value is stored in a local variable which is not copied elsewhere before
the point of the error return (video_register_device does not save its
first argument anywhere if it returns a negative value). Thus, a
video_device_release it needed before the error return.
The problem was found using the following semantic match.
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
type T,T1,T2;
identifier E;
statement S;
expression x1,x2,x3;
int ret;
@@
T E;
...
* E = video_device_alloc(...);
if (E == NULL) S
... when != video_device_release(...,(T1)E,...)
when != if (E != NULL) { ... video_device_release(...,(T1)E,...); ...}
when != x1 = (T1)E
when != E = x3;
when any
if (...) {
... when != video_device_release(...,(T2)E,...)
when != if (E != NULL) { ... video_device_release(...,(T2)E,...); ...}
when != x2 = (T2)E
(
* return;
|
* return ret;
)
}
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
CC: Oliver Endriss <o.endriss@gmx.de>
CC: Michael Hunold <michael@mihu.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/common/saa7146_fops.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index b40bf2306fbc..f0703d8bc3e8 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146_fops.c | |||
@@ -538,6 +538,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev, | |||
538 | // fixme: -1 should be an insmod parameter *for the extension* (like "video_nr"); | 538 | // fixme: -1 should be an insmod parameter *for the extension* (like "video_nr"); |
539 | if (video_register_device(vfd, type, -1) < 0) { | 539 | if (video_register_device(vfd, type, -1) < 0) { |
540 | ERR(("cannot register v4l2 device. skipping.\n")); | 540 | ERR(("cannot register v4l2 device. skipping.\n")); |
541 | video_device_release(vfd); | ||
541 | return -1; | 542 | return -1; |
542 | } | 543 | } |
543 | 544 | ||