Commit aa2c91bd authored by Floris Bos's avatar Floris Bos Committed by Kevin Wolf
Browse files

ide: Change serial number strncpy() to pstrcpy() 



strncpy may not null-terminate the destination string.

Cc: kwolf@redhat.com
Signed-off-by: default avatarFloris Bos <dev@noc-ps.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 27e0c9a1

blockdev.c

+3 −2
Original line number Diff line number Diff line
@@ -532,8 +532,9 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) 
    dinfo->unit = unit_id;

    dinfo->opts = opts;

    dinfo->refcount = 1;

    if (serial)

        strncpy(dinfo->serial, serial, sizeof(dinfo->serial) - 1);

    if (serial) {

        pstrcpy(dinfo->serial, sizeof(dinfo->serial), serial);

    }

    QTAILQ_INSERT_TAIL(&drives, dinfo, next);



    bdrv_set_on_error(dinfo->bdrv, on_read_error, on_write_error);

hw/ide/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1879,7 +1879,7 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind, 
        }

    }

    if (serial) {

        strncpy(s->drive_serial_str, serial, sizeof(s->drive_serial_str));

        pstrcpy(s->drive_serial_str, sizeof(s->drive_serial_str), serial);

    } else {

        snprintf(s->drive_serial_str, sizeof(s->drive_serial_str),

                 "QM%05d", s->drive_serial);