mdmon: fix wrong array state when disk fails during mdmon startup

[thirdparty/mdadm.git] / sg_io.c

diff --git a/sg_io.c b/sg_io.c
index 4ae5d927a7eb8bf67ae3e175431b2e412426e522..7889a95ecae4dbead43c1e1b866277152924ca49 100644 (file)
--- a/sg_io.c
+++ b/sg_io.c
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2007 Intel Corporation
+ * Copyright (C) 2007-2008 Intel Corporation
  *
- *     Retrieve drive serial numbers for scsi disks
+ *     Retrieve drive serial numbers for scsi disks
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -23,20 +23,38 @@
 
 int scsi_get_serial(int fd, void *buf, size_t buf_len)
 {
-       unsigned char inq_cmd[] = {INQUIRY, 1, 0x80, 0, buf_len, 0};
+       unsigned char rsp_buf[255];
+       unsigned char inq_cmd[] = {INQUIRY, 1, 0x80, 0, sizeof(rsp_buf), 0};
        unsigned char sense[32];
        struct sg_io_hdr io_hdr;
+       int rv;
+       unsigned int rsp_len;
 
        memset(&io_hdr, 0, sizeof(io_hdr));
        io_hdr.interface_id = 'S';
        io_hdr.cmdp = inq_cmd;
        io_hdr.cmd_len = sizeof(inq_cmd);
-       io_hdr.dxferp = buf;
-       io_hdr.dxfer_len = buf_len;
+       io_hdr.dxferp = rsp_buf;
+       io_hdr.dxfer_len = sizeof(rsp_buf);
        io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
        io_hdr.sbp = sense;
        io_hdr.mx_sb_len = sizeof(sense);
        io_hdr.timeout = 5000;
 
-       return ioctl(fd, SG_IO, &io_hdr);
+       rv = ioctl(fd, SG_IO, &io_hdr);
+
+       if (rv)
+               return rv;
+
+       if ((io_hdr.info & SG_INFO_OK_MASK) != SG_INFO_OK)
+               return -1;
+
+       rsp_len = rsp_buf[3];
+
+       if (!rsp_len || buf_len < rsp_len)
+               return -1;
+
+       memcpy(buf, &rsp_buf[4], rsp_len);
+
+       return 0;
 }