[PATCH[ udev: ata_id: Fix length of INQUIRY command

[elogind.git] / extras / ata_id / ata_id.c

diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index cadadfc27fa422d86c40f784778ba34192cc68d5..64df86c23ad429a53c951209ff4205aed7dc5ca7 100644 (file)
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -52,7 +52,7 @@ static int disk_scsi_inquiry_command(int      fd,
                                     size_t   buf_len)
 {
        struct sg_io_v4 io_v4;
-       uint8_t cdb[12];
+       uint8_t cdb[6];
        uint8_t sense[32];
        int ret;
 
@@ -547,12 +547,12 @@ int main(int argc, char *argv[])
        memcpy (model, id.model, 40);
        model[40] = '\0';
        udev_util_encode_string(model, model_enc, sizeof(model_enc));
-       udev_util_replace_whitespace((char *) id.model, model, 40);
-       udev_util_replace_chars(model, NULL);
-       udev_util_replace_whitespace((char *) id.serial_no, serial, 20);
-       udev_util_replace_chars(serial, NULL);
-       udev_util_replace_whitespace((char *) id.fw_rev, revision, 8);
-       udev_util_replace_chars(revision, NULL);
+       util_replace_whitespace((char *) id.model, model, 40);
+       util_replace_chars(model, NULL);
+       util_replace_whitespace((char *) id.serial_no, serial, 20);
+       util_replace_chars(serial, NULL);
+       util_replace_whitespace((char *) id.fw_rev, revision, 8);
+       util_replace_chars(revision, NULL);
 
        if (export) {
                /* Set this to convey the disk speaks the ATA protocol */