From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Sascha Hauer <s.hauer@pengutronix.de>,
Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>,
linux-spi@vger.kernel.org
Subject: [PATCH AUTOSEL 5.8 28/29] spi: fsl-dspi: fix use-after-free in remove path
Date: Mon, 28 Sep 2020 21:30:25 -0400 [thread overview]
Message-ID: <20200929013027.2406344-28-sashal@kernel.org> (raw)
In-Reply-To: <20200929013027.2406344-1-sashal@kernel.org>
From: Sascha Hauer <s.hauer@pengutronix.de>
[ Upstream commit 530b5affc675ade5db4a03f04ed7cd66806c8a1a ]
spi_unregister_controller() not only unregisters the controller, but
also frees the controller. This will free the driver data with it, so
we must not access it later dspi_remove().
Solve this by allocating the driver data separately from the SPI
controller.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Link: https://lore.kernel.org/r/20200923131026.20707-1-s.hauer@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/spi/spi-fsl-dspi.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 91c6affe139c9..aae9f9a7aea6c 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -1273,11 +1273,14 @@ static int dspi_probe(struct platform_device *pdev)
void __iomem *base;
bool big_endian;
- ctlr = spi_alloc_master(&pdev->dev, sizeof(struct fsl_dspi));
+ dspi = devm_kzalloc(&pdev->dev, sizeof(*dspi), GFP_KERNEL);
+ if (!dspi)
+ return -ENOMEM;
+
+ ctlr = spi_alloc_master(&pdev->dev, 0);
if (!ctlr)
return -ENOMEM;
- dspi = spi_controller_get_devdata(ctlr);
dspi->pdev = pdev;
dspi->ctlr = ctlr;
@@ -1414,7 +1417,7 @@ static int dspi_probe(struct platform_device *pdev)
if (dspi->devtype_data->trans_mode != DSPI_DMA_MODE)
ctlr->ptp_sts_supported = true;
- platform_set_drvdata(pdev, ctlr);
+ platform_set_drvdata(pdev, dspi);
ret = spi_register_controller(ctlr);
if (ret != 0) {
@@ -1437,8 +1440,7 @@ static int dspi_probe(struct platform_device *pdev)
static int dspi_remove(struct platform_device *pdev)
{
- struct spi_controller *ctlr = platform_get_drvdata(pdev);
- struct fsl_dspi *dspi = spi_controller_get_devdata(ctlr);
+ struct fsl_dspi *dspi = platform_get_drvdata(pdev);
/* Disconnect from the SPI framework */
spi_unregister_controller(dspi->ctlr);
--
2.25.1
next prev parent reply other threads:[~2020-09-29 1:31 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 1:29 [PATCH AUTOSEL 5.8 01/29] clocksource/drivers/timer-gx6605s: Fixup counter reload Sasha Levin
2020-09-29 1:29 ` [PATCH AUTOSEL 5.8 02/29] vboxsf: Fix the check for the old binary mount-arguments struct Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 03/29] mt76: mt7915: use ieee80211_free_txskb to free tx skbs Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 04/29] libbpf: Remove arch-specific include path in Makefile Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 05/29] drivers/net/wan/hdlc_fr: Add needed_headroom for PVC devices Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 06/29] Revert "wlcore: Adding suppoprt for IGTK key in wlcore driver" Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 07/29] drm/sun4i: mixer: Extend regmap max_register Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 08/29] net: dsa: microchip: look for phy-mode in port nodes Sasha Levin
2020-09-29 5:56 ` Helmut Grohne
2020-10-04 12:46 ` Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 09/29] hv_netvsc: Cache the current data path to avoid duplicate call and message Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 10/29] net: dec: de2104x: Increase receive ring size for Tulip Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 11/29] rndis_host: increase sleep time in the query-response loop Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 12/29] nvme-pci: disable the write zeros command for Intel 600P/P3100 Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 13/29] nvme-core: get/put ctrl and transport module in nvme_dev_open/release() Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 14/29] regmap: debugfs: Fix handling of name string for debugfs init delays Sasha Levin
2020-09-29 8:33 ` Charles Keepax
2020-10-04 12:54 ` Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 15/29] fuse: fix the ->direct_IO() treatment of iov_iter Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 16/29] drivers/net/wan/lapbether: Make skb->protocol consistent with the header Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 17/29] drivers/net/wan/hdlc: Set skb->protocol before transmitting Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 18/29] mac80211: Fix radiotap header channel flag for 6GHz band Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 19/29] mac80211: do not allow bigger VHT MPDUs than the hardware supports Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 20/29] tracing: Make the space reserved for the pid wider Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 21/29] tools/io_uring: fix compile breakage Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 22/29] io_uring: mark statx/files_update/epoll_ctl as non-SQPOLL Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 23/29] cpuidle: psci: Fix suspicious RCU usage Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 24/29] spi: fsl-espi: Only process interrupts for expected events Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 25/29] net: dsa: felix: fix some key offsets for IP4_TCP_UDP VCAP IS2 entries Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 26/29] nvme-pci: fix NULL req in completion handler Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 27/29] nvme-fc: fail new connections to a deleted host or remote port Sasha Levin
2020-09-29 1:30 ` Sasha Levin [this message]
2020-09-29 6:22 ` [PATCH AUTOSEL 5.8 28/29] spi: fsl-dspi: fix use-after-free in remove path Sascha Hauer
2020-10-04 12:58 ` Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.8 29/29] scripts/kallsyms: skip ppc compiler stub *.long_branch.* / *.plt_branch.* Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200929013027.2406344-28-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).