Skip to content

Commit

Permalink
Merge tag 'spi-fix-v6.14-rc7' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/git/broonie/spi

Pull spi fix from Mark Brown:
 "This is a straightforward fix for a reference count leak in the rarely
  used SPI device mode functionality"

* tag 'spi-fix-v6.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: Fix reference count leak in slave_show()
  • Loading branch information
Linus Torvalds committed Mar 21, 2025
2 parents 21d1ccf + 176fda5 commit 88d324e
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/spi/spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -2954,9 +2954,13 @@ static ssize_t slave_show(struct device *dev, struct device_attribute *attr,
struct spi_controller *ctlr = container_of(dev, struct spi_controller,
dev);
struct device *child;
int ret;

child = device_find_any_child(&ctlr->dev);
return sysfs_emit(buf, "%s\n", child ? to_spi_device(child)->modalias : NULL);
ret = sysfs_emit(buf, "%s\n", child ? to_spi_device(child)->modalias : NULL);
put_device(child);

return ret;
}

static ssize_t slave_store(struct device *dev, struct device_attribute *attr,
Expand Down

0 comments on commit 88d324e

Please sign in to comment.