Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-6
+1
-4
drivers/ata/libahci_platform.c
+1
-4
drivers/ata/libahci_platform.c
···
440
440
hpriv->phy_regulator = devm_regulator_get(dev, "phy");
441
441
if (IS_ERR(hpriv->phy_regulator)) {
442
442
rc = PTR_ERR(hpriv->phy_regulator);
443
-
if (rc == -EPROBE_DEFER)
444
-
goto err_out;
445
-
rc = 0;
446
-
hpriv->phy_regulator = NULL;
443
+
goto err_out;
447
444
}
448
445
449
446
if (flags & AHCI_PLATFORM_GET_RESETS) {
+4
-2
drivers/ata/pata_legacy.c
+4
-2
drivers/ata/pata_legacy.c
···
352
352
iowrite32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
353
353
354
354
if (unlikely(slop)) {
355
-
__le32 pad;
355
+
__le32 pad = 0;
356
+
356
357
if (rw == READ) {
357
358
pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
358
359
memcpy(buf + buflen - slop, &pad, slop);
···
743
742
ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
744
743
745
744
if (unlikely(slop)) {
746
-
__le32 pad;
745
+
__le32 pad = 0;
746
+
747
747
if (rw == WRITE) {
748
748
memcpy(&pad, buf + buflen - slop, slop);
749
749
iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);