diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2021-10-06 10:34:19 +0300 |
|---|---|---|
| committer | Damien Le Moal <damien.lemoal@wdc.com> | 2021-10-12 09:52:35 +0900 |
| commit | 013923477cb311293df9079332cf8b806ed0e6f2 (patch) | |
| tree | c53c623350d81b8d0d4bb18682b18fa95d328a4d | |
| parent | 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc (diff) | |
| download | lwn-013923477cb311293df9079332cf8b806ed0e6f2.tar.gz lwn-013923477cb311293df9079332cf8b806ed0e6f2.zip | |
pata_legacy: fix a couple uninitialized variable bugs
The last byte of "pad" is used without being initialized.
Fixes: 55dba3120fbc ("libata: update ->data_xfer hook for ATAPI")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
| -rw-r--r-- | drivers/ata/pata_legacy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c index c3e6592712c4..0a8bf09a5c19 100644 --- a/drivers/ata/pata_legacy.c +++ b/drivers/ata/pata_legacy.c @@ -352,7 +352,8 @@ static unsigned int pdc_data_xfer_vlb(struct ata_queued_cmd *qc, iowrite32_rep(ap->ioaddr.data_addr, buf, buflen >> 2); if (unlikely(slop)) { - __le32 pad; + __le32 pad = 0; + if (rw == READ) { pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr)); memcpy(buf + buflen - slop, &pad, slop); @@ -742,7 +743,8 @@ static unsigned int vlb32_data_xfer(struct ata_queued_cmd *qc, ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2); if (unlikely(slop)) { - __le32 pad; + __le32 pad = 0; + if (rw == WRITE) { memcpy(&pad, buf + buflen - slop, slop); iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr); |