Commit cd079b1f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libata-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull libata fixes from Damien Le Moal:
 "Two fixes for this cycle:

   - Fix a null pointer dereference in ahci-platform driver (from Hai)

   - Fix uninitialized variables in pata_legacy driver (from Dan)"

* tag 'libata-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: ahci_platform: fix null-ptr-deref in ahci_platform_enable_regulators()
  pata_legacy: fix a couple uninitialized variable bugs
parents f2b3420b 776c7501

drivers/ata/libahci_platform.c

+1 −4
Original line number Diff line number Diff line
@@ -440,10 +440,7 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, 
	hpriv->phy_regulator = devm_regulator_get(dev, "phy");

	if (IS_ERR(hpriv->phy_regulator)) {

		rc = PTR_ERR(hpriv->phy_regulator);

		if (rc == -EPROBE_DEFER)

		goto err_out;

		rc = 0;

		hpriv->phy_regulator = NULL;

	}



	if (flags & AHCI_PLATFORM_GET_RESETS) {

drivers/ata/pata_legacy.c

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