Re: [PATCH] IDE-TAPE NULL terminate strings.

Mark de Wever
2008-09-23T17:03:59Z

On Tue, Sep 23, 2008 at 09:48:45AM +0200, Borislav Petkov wrote:
> ---
> diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
> index 1bce84b..3833189 100644
> --- a/drivers/ide/ide-tape.c
> +++ b/drivers/ide/ide-tape.c
> @@ -2338,7 +2338,7 @@ static void idetape_get_inquiry_results(ide_drive_t *drive)
> {
> idetape_tape_t *tape = drive->driver_data;
> struct ide_atapi_pc pc;
> - char fw_rev[6], vendor_id[10], product_id[18];
> + char fw_rev[4], vendor_id[8], product_id[16];
>
> idetape_create_inquiry_cmd(&pc);
> if (idetape_queue_pc_tail(drive, &pc)) {
> @@ -2350,11 +2350,11 @@ static void idetape_get_inquiry_results(ide_drive_t *drive)
> memcpy(product_id, &pc.buf[16], 16);
> memcpy(fw_rev, &pc.buf[32], 4);
>
> - ide_fixstring(vendor_id, 10, 0);
> - ide_fixstring(product_id, 18, 0);
> - ide_fixstring(fw_rev, 6, 0);
> + ide_fixstring(vendor_id, 8, 0);
> + ide_fixstring(product_id, 16, 0);
> + ide_fixstring(fw_rev, 4, 0);
>
> - printk(KERN_INFO "ide-tape: %s <-> %s: %s %s rev %s\n",
> + printk(KERN_INFO "ide-tape: %s <-> %s: %.8s %.16s rev %.4s\n",
> drive->name, tape->name, vendor_id, product_id, fw_rev);
> }
>
>

I think this patch looks good, better as all previous versions
(including my initial version). I just tested it and it solves the
problem. Feel free to add my tested-by.

Regards,
Mark de Wever

PS I was not able to test earlier ;-)