rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Add patch from Richard W.M. Jones to fix virtio scsi oops (rhbz 847548)

Browse Source
This commit is contained in:
Josh Boyer 2012-08-21 10:47:07 -04:00
parent 2875d27c9a
commit a78e28b4db
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel.spec
View File

@ -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

28
virtio-scsi-Initialize-scatterlist-structure.patch Normal file
View File

@ -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