diff options
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | ucvideo-fix-crash-when-linking-entities.patch | 34 |
2 files changed, 40 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index f919ce53f..c94a6324f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -720,6 +720,7 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch Patch13002: revert-efi-rtclock.patch Patch13003: efi-dont-map-boot-services-on-32bit.patch Patch13004: iwlagn-revert-max-aggregate-size.patch +Patch13005: ucvideo-fix-crash-when-linking-entities.patch Patch20000: utrace.patch @@ -1325,6 +1326,7 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch ApplyPatch revert-efi-rtclock.patch ApplyPatch efi-dont-map-boot-services-on-32bit.patch ApplyPatch iwlagn-revert-max-aggregate-size.patch +ApplyPatch ucvideo-fix-crash-when-linking-entities.patch # utrace. ApplyPatch utrace.patch @@ -2037,6 +2039,9 @@ fi # ||----w | # || || %changelog +* Wed Sep 07 2011 Josh Boyer <jwboyer@redhat.com> +- Add patch to fix oops when linking entities in ucvideo (rhbz 735437) + * Fri Sep 02 2011 Dave Jones <davej@redhat.com> - utrace: s390: fix the compile problem with traps.c (rhbz 735118) diff --git a/ucvideo-fix-crash-when-linking-entities.patch b/ucvideo-fix-crash-when-linking-entities.patch new file mode 100644 index 000000000..69f86d64c --- /dev/null +++ b/ucvideo-fix-crash-when-linking-entities.patch @@ -0,0 +1,34 @@ +The uvc_mc_register_entity() function wrongfully selects the +media_entity associated with a UVC entity when creating links. This +results in access to uninitialized media_entity structures and can hit a +BUG_ON statement in media_entity_create_link(). Fix it. + +Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> +--- + drivers/media/video/uvc/uvc_entity.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +This patch should fix a v3.0 regression that results in a kernel crash as +reported in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637740 and +https://bugzilla.redhat.com/show_bug.cgi?id=735437. + +Test results will be welcome. + +diff --git a/drivers/media/video/uvc/uvc_entity.c b/drivers/media/video/uvc/uvc_entity.c +index 48fea37..29e2399 100644 +--- a/drivers/media/video/uvc/uvc_entity.c ++++ b/drivers/media/video/uvc/uvc_entity.c +@@ -49,7 +49,7 @@ static int uvc_mc_register_entity(struct uvc_video_chain *chain, + if (remote == NULL) + return -EINVAL; + +- source = (UVC_ENTITY_TYPE(remote) != UVC_TT_STREAMING) ++ source = (UVC_ENTITY_TYPE(remote) == UVC_TT_STREAMING) + ? (remote->vdev ? &remote->vdev->entity : NULL) + : &remote->subdev.entity; + if (source == NULL) +-- +Regards, + +Laurent Pinchart + |