diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-08-21 10:47:07 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-08-21 10:47:14 -0400 |
| commit | a78e28b4db91e67b400bd1a59511a0ef9ba0794c (patch) | |
| tree | 6ec5cc53f8b187bec41c09df7d92378cdc9deef4 | |
| parent | 2875d27c9a977df8cef028fbf82c505f5a7fd712 (diff) | |
| download | kernel-a78e28b4db91e67b400bd1a59511a0ef9ba0794c.tar.gz kernel-a78e28b4db91e67b400bd1a59511a0ef9ba0794c.tar.xz kernel-a78e28b4db91e67b400bd1a59511a0ef9ba0794c.zip | |
Add patch from Richard W.M. Jones to fix virtio scsi oops (rhbz 847548)
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | virtio-scsi-Initialize-scatterlist-structure.patch | 28 |
2 files changed, 35 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 39edbfe80..5fd90d063 100644 --- a/kernel.spec +++ b/kernel.spec @@ -749,6 +749,9 @@ Patch22059: uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch Patch22065: fbcon-fix-race-condition-between-console-lock-and-cursor-timer.patch +#rhbz 847548 +Patch22066: virtio-scsi-Initialize-scatterlist-structure.patch + # END OF PATCH DEFINITIONS %endif @@ -1441,6 +1444,9 @@ ApplyPatch uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch ApplyPatch fbcon-fix-race-condition-between-console-lock-and-cursor-timer.patch +#rhbz 847548 +ApplyPatch virtio-scsi-Initialize-scatterlist-structure.patch + # END OF PATCH APPLICATIONS %endif @@ -2304,6 +2310,7 @@ fi # || || %changelog * Tue Aug 21 2012 Josh Boyer <jwboyer@redhat.com> +- Add patch from Richard W.M. Jones to fix virtio scsi oops (rhbz 847548) - Add patch from Dave Airlie to fix fb cursor vs grub2 gfxterm hang * Mon Aug 20 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc2.git1.1 diff --git a/virtio-scsi-Initialize-scatterlist-structure.patch b/virtio-scsi-Initialize-scatterlist-structure.patch new file mode 100644 index 000000000..4445d6838 --- /dev/null +++ b/virtio-scsi-Initialize-scatterlist-structure.patch @@ -0,0 +1,28 @@ +From: "Richard W.M. Jones" <rjones@redhat.com> + +The sg struct is used without being initialized. + +https://bugzilla.redhat.com/show_bug.cgi?id=847548 + +Signed-off-by: Richard W.M. Jones <rjones@redhat.com> +--- + drivers/scsi/virtio_scsi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c +index c7030fb..8a66f83 100644 +--- a/drivers/scsi/virtio_scsi.c ++++ b/drivers/scsi/virtio_scsi.c +@@ -219,7 +219,7 @@ static int virtscsi_kick_event(struct virtio_scsi *vscsi, + struct scatterlist sg; + unsigned long flags; + +- sg_set_buf(&sg, &event_node->event, sizeof(struct virtio_scsi_event)); ++ sg_init_one(&sg, &event_node->event, sizeof(struct virtio_scsi_event)); + + spin_lock_irqsave(&vscsi->event_vq.vq_lock, flags); + +-- +1.7.10.4 + + |