From: Nicholas Mc Guire <hofrat@osadl.org>
To: Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: Peter Rosin <peda@axentia.se>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
Nicholas Mc Guire <hofrat@osadl.org>
Subject: [PATCH] i2c: mux: demux-pinctrl: handle failure case of devm_kstrdup()
Date: Sat, 1 Dec 2018 11:01:10 +0100 [thread overview]
Message-ID: <1543658470-20887-1-git-send-email-hofrat@osadl.org> (raw)
devm_kstrdup() may return NULL if internal allocation failed.
Thus using name, value is unsafe without being checked. As
i2c_demux_pinctrl_probe() can return -ENOMEM in other cases
a dev_err() message is included to make the failure location
clear.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Fixes: e35478eac030 ("i2c: mux: demux-pinctrl: run properly with multiple instances")
---
Problem located with experimental coccinelle script
Q: The use of devm_kstrdup() seems a bit odd while technically not wrong,
personally I think devm_kasprintf() would be more suitable here.
Patch was compile tested with: multi_v7_defconfig
(implies I2C_DEMUX_PINCTRL=y)
Patch is against 4.20-rc4 (localversion-next is next-20181130)
drivers/i2c/muxes/i2c-demux-pinctrl.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index 035032e..c466999 100644
--- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
@@ -244,6 +244,12 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
props[i].name = devm_kstrdup(&pdev->dev, "status", GFP_KERNEL);
props[i].value = devm_kstrdup(&pdev->dev, "ok", GFP_KERNEL);
+ if (!props[i].name || !props[i].value) {
+ dev_err(&pdev->dev,
+ "chan %d name, value allocation failed\n", i);
+ err = -ENOMEM;
+ goto err_rollback;
+ }
props[i].length = 3;
of_changeset_init(&priv->chan[i].chgset);
--
2.1.4
next reply other threads:[~2018-12-01 10:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-01 10:01 Nicholas Mc Guire [this message]
2018-12-04 11:16 ` [PATCH] i2c: mux: demux-pinctrl: handle failure case of devm_kstrdup() Peter Rosin
2018-12-04 11:43 ` Nicholas Mc Guire
2018-12-04 12:13 ` Nicholas Mc Guire
2018-12-04 13:49 ` Peter Rosin
2018-12-04 14:25 ` Nicholas Mc Guire
2018-12-04 14:29 ` Peter Rosin
2018-12-04 14:11 ` Peter Rosin
2018-12-04 14:36 ` Nicholas Mc Guire
2018-12-04 14:50 ` Peter Rosin
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=1543658470-20887-1-git-send-email-hofrat@osadl.org \
--to=hofrat@osadl.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peda@axentia.se \
--cc=wsa+renesas@sang-engineering.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