Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9352ed9 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

pata_legacy: fix a couple uninitialized variable bugs 



commit 013923477cb311293df9079332cf8b806ed0e6f2 upstream.

The last byte of "pad" is used without being initialized.

Fixes: 55dba312 ("libata: update ->data_xfer hook for ATAPI")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2bde4aca

drivers/ata/pata_legacy.c

+4 −2
Original line number Diff line number Diff line
@@ -315,7 +315,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);
@@ -705,7 +706,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);