From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 16 Jul 2010 23:52:41 +0000 (+0200)
Subject: 	* disk/scsi.c (grub_scsi_open): Fix incorrect pointer dereference.
X-Git-Tag: 1.99~729
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=986aad56c1416ffcf738657e0dd0710b36254189;p=thirdparty%2Fgrub.git

	* disk/scsi.c (grub_scsi_open): Fix incorrect pointer dereference.
---

diff --git a/ChangeLog b/ChangeLog
index 835293aec..3fd31efaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/scsi.c (grub_scsi_open): Fix incorrect pointer dereference.
+
 2010-07-14  Anton Blanchard  <anton@samba.org>
 
 	* loader/powerpc/ieee1275/linux.c (grub_cmd_linux): Do not reject
diff --git a/disk/scsi.c b/disk/scsi.c
index 5f04d9ef7..60192bef5 100644
--- a/disk/scsi.c
+++ b/disk/scsi.c
@@ -402,7 +402,7 @@ grub_scsi_open (const char *name, grub_disk_t disk)
       if (p->open (bus, scsi))
 	continue;
 
-      disk->id = grub_make_scsi_id (scsi->dev->id, bus, lun);
+      disk->id = grub_make_scsi_id (p->id, bus, lun);
       disk->data = scsi;
       scsi->dev = p;
       scsi->lun = lun;