ide: do_identify() string termination fix
authorTejun Heo <tj@home-tj.org>
Mon, 5 Nov 2007 20:42:25 +0000 (21:42 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Mon, 5 Nov 2007 20:42:25 +0000 (21:42 +0100)
Terminates id->model string before invoking strstr() in do_identify().

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-probe.c

index 6a6f2e066b4679b7c1a2ff16704af8a67bbc7673..56fb0b84342959d9a51e116ff3b0686d47998251 100644 (file)
@@ -172,11 +172,12 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
        ide_fixstring(id->fw_rev,    sizeof(id->fw_rev),    bswap);
        ide_fixstring(id->serial_no, sizeof(id->serial_no), bswap);
 
+       /* we depend on this a lot! */
+       id->model[sizeof(id->model)-1] = '\0';
+
        if (strstr(id->model, "E X A B Y T E N E S T"))
                goto err_misc;
 
-       /* we depend on this a lot! */
-       id->model[sizeof(id->model)-1] = '\0';
        printk("%s: %s, ", drive->name, id->model);
        drive->present = 1;
        drive->dead = 0;