TononixOS/ubports_kernel_google_msm
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v4l2: fix the memory leak

Browse Source 
commit 9985432a82e6700cf9759f413ecaecbf617318cb

check for fh->dev being NULL before kzalloc to fix the memory leak

Change-Id: I3377ef39297f63c692aa5451d2bdbe327e2df18a
This commit is contained in:
Devin Kim
2012-11-07 15:47:18 -08:00
committed by Iliyan Malchev
parent eed21b25b7
commit 21cfe24ba2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/v4l2-event.c
View File

@@ -227,6 +227,11 @@ int v4l2_event_subscribe(struct v4l2_fh *fh,
return -EINVAL;
}
if (!fh->vdev) {
pr_err("%s: fh->vdev is NULL\n", __func__);
return -EIO;
}
sev = kzalloc(sizeof(*sev) + sizeof(struct v4l2_kevent) * elems, GFP_KERNEL);
if (!sev)
return -ENOMEM;
@@ -242,11 +247,6 @@ int v4l2_event_subscribe(struct v4l2_fh *fh,
sev->merge = ctrls_merge;
}
if (!fh->vdev) {
pr_err("%s: fh->vdev is NULL\n", __func__);
return -EIO;
}
spin_lock_irqsave(&fh->vdev->fh_lock, flags);
found_ev = v4l2_event_subscribed(fh, sub->type, sub->id);
if (!found_ev)