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

diff --git a/ChangeLog b/ChangeLog
index 835293aecb60eec00008a35e35ae88179d1b8698..3fd31efaf0b737cec0bc5775f0ec317326a49d70 100644 (file)
--- 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 5f04d9ef7c08c7f876afe9ed6058ad981f68815b..60192bef5b6b7a0f5c047298a386d394fb7c40e4 100644 (file)
--- 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;