Merge tag 'ata-6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux

torvalds · torvalds · commit 5d97859e1775 · 2024-12-14T08:40:05.000-08:00
Pull ata fix from Damien Le Moal:

 - Fix an OF node reference leak in the sata_highbank driver

* tag 'ata-6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
  ata: sata_highbank: fix OF node reference leak in highbank_initialize_phys()
diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
@@ -348,6 +348,7 @@ static int highbank_initialize_phys(struct device *dev, void __iomem *addr)
 			phy_nodes[phy] = phy_data.np;
 			cphy_base[phy] = of_iomap(phy_nodes[phy], 0);
 			if (cphy_base[phy] == NULL) {
+				of_node_put(phy_data.np);
 				return 0;
 			}
 			phy_count += 1;

Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,7 @@ static int highbank_initialize_phys(struct device dev, void __iomem addr)`
`348`	`348`	`phy_nodes[phy] = phy_data.np;`
`349`	`349`	`cphy_base[phy] = of_iomap(phy_nodes[phy], 0);`
`350`	`350`	`if (cphy_base[phy] == NULL) {`
	`351`	`+ of_node_put(phy_data.np);`
`351`	`352`	`return 0;`
`352`	`353`	`}`
`353`	`354`	`phy_count += 1;`