| Message ID | 20240830074106.8744-1-hanchunchao@inspur.com |
|---|---|
| State | Accepted |
| Commit | 2920294686ec23211637998f3ec386dfd3d784a6 |
| Headers | show |
| Series | spi: intel: Add check devm_kasprintf() returned value | expand |
On Fri, 30 Aug 2024 15:41:06 +0800, Charles Han wrote: > intel_spi_populate_chip() use devm_kasprintf() to set pdata->name. > This can return a NULL pointer on failure but this returned value > is not checked. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: intel: Add check devm_kasprintf() returned value commit: 2920294686ec23211637998f3ec386dfd3d784a6 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-intel.c b/drivers/spi/spi-intel.c index 3e5dcf2b3c8a..795b7e72baea 100644 --- a/drivers/spi/spi-intel.c +++ b/drivers/spi/spi-intel.c @@ -1390,6 +1390,9 @@ static int intel_spi_populate_chip(struct intel_spi *ispi) pdata->name = devm_kasprintf(ispi->dev, GFP_KERNEL, "%s-chip1", dev_name(ispi->dev)); + if (!pdata->name) + return -ENOMEM; + pdata->nr_parts = 1; parts = devm_kcalloc(ispi->dev, pdata->nr_parts, sizeof(*parts), GFP_KERNEL);
intel_spi_populate_chip() use devm_kasprintf() to set pdata->name. This can return a NULL pointer on failure but this returned value is not checked. Fixes: e58db3bcd93b ("spi: intel: Add default partition and name to the second chip") Signed-off-by: Charles Han <hanchunchao@inspur.com> --- drivers/spi/spi-intel.c | 3 +++ 1 file changed, 3 insertions(+)