From: David Lechner <dlechner@baylibre.com>
To: Mark Brown <broonie@kernel.org>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
Nuno Sa <nuno.sa@analog.com>
Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org,
David Lechner <dlechner@baylibre.com>,
kernel test robot <lkp@intel.com>,
Dan Carpenter <dan.carpenter@linaro.org>
Subject: [PATCH 2/2] spi: offload: fix use after free
Date: Wed, 12 Feb 2025 11:33:13 -0600 [thread overview]
Message-ID: <20250212-spi-offload-fixes-v1-2-e192c69e3bb3@baylibre.com> (raw)
In-Reply-To: <20250212-spi-offload-fixes-v1-0-e192c69e3bb3@baylibre.com>
Fix a use after free bug in devm_spi_offload_get() where a pointer
was dereferenced after being freed. Instead, add a new local variable
to avoid needing to use the resource pointer to access the offload
pointer.
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/202502112344.7ggtFzyn-lkp@intel.com/
Fixes: 5a19e1985d01 ("spi: axi-spi-engine: implement offload support")
Signed-off-by: David Lechner <dlechner@baylibre.com>
---
drivers/spi/spi-offload.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/spi/spi-offload.c b/drivers/spi/spi-offload.c
index df5e963d5ee29d37833559595536a460c530bc81..6bad042fe4373e8b91dae3154ef5e22744a4acd0 100644
--- a/drivers/spi/spi-offload.c
+++ b/drivers/spi/spi-offload.c
@@ -108,6 +108,7 @@ struct spi_offload *devm_spi_offload_get(struct device *dev,
const struct spi_offload_config *config)
{
struct spi_controller_and_offload *resource;
+ struct spi_offload *offload;
int ret;
if (!spi || !config)
@@ -120,18 +121,20 @@ struct spi_offload *devm_spi_offload_get(struct device *dev,
if (!resource)
return ERR_PTR(-ENOMEM);
- resource->controller = spi->controller;
- resource->offload = spi->controller->get_offload(spi, config);
- if (IS_ERR(resource->offload)) {
+ offload = spi->controller->get_offload(spi, config);
+ if (IS_ERR(offload)) {
kfree(resource);
- return resource->offload;
+ return offload;
}
+ resource->controller = spi->controller;
+ resource->offload = offload;
+
ret = devm_add_action_or_reset(dev, spi_offload_put, resource);
if (ret)
return ERR_PTR(ret);
- return resource->offload;
+ return offload;
}
EXPORT_SYMBOL_GPL(devm_spi_offload_get);
--
2.43.0
next prev parent reply other threads:[~2025-02-12 17:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-12 17:33 [PATCH 0/2] spi: offload: fixes David Lechner
2025-02-12 17:33 ` [PATCH 1/2] spi: fix missing offload_flags doc David Lechner
2025-02-12 17:33 ` David Lechner [this message]
2025-02-12 18:59 ` [PATCH 0/2] spi: offload: fixes Mark Brown
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=20250212-spi-offload-fixes-v1-2-e192c69e3bb3@baylibre.com \
--to=dlechner@baylibre.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=broonie@kernel.org \
--cc=dan.carpenter@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=lkp@intel.com \
--cc=nuno.sa@analog.com \
/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
all inboxes | Powered by JetHome®