From: Kang Chen <void0red@gmail.com>
To: simon.horman@corigine.com
Cc: krzysztof.kozlowski@linaro.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, void0red@gmail.com
Subject: [PATCH v2] nfc: fdp: add null check of devm_kmalloc_array in fdp_nci_i2c_read_device_properties
Date: Mon, 27 Feb 2023 09:41:44 +0800 [thread overview]
Message-ID: <20230227014144.1466102-1-void0red@gmail.com> (raw)
In-Reply-To: <Y/t729AIYjxuP6X6@corigine.com>
devm_kmalloc_array may fails, *fw_vsc_cfg might be null and cause
out-of-bounds write in device_property_read_u8_array later.
Fixes: a06347c04c13 ("NFC: Add Intel Fields Peak NFC solution driver")
Signed-off-by: Kang Chen <void0red@gmail.com>
---
v2 -> v1: add debug prompt and Fixes tag
drivers/nfc/fdp/i2c.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c
index 2d53e0f88..d3272a54b 100644
--- a/drivers/nfc/fdp/i2c.c
+++ b/drivers/nfc/fdp/i2c.c
@@ -247,6 +247,11 @@ static void fdp_nci_i2c_read_device_properties(struct device *dev,
len, sizeof(**fw_vsc_cfg),
GFP_KERNEL);
+ if (!*fw_vsc_cfg) {
+ dev_dbg(dev, "Not enough memory\n");
+ goto out;
+ }
+
r = device_property_read_u8_array(dev, FDP_DP_FW_VSC_CFG_NAME,
*fw_vsc_cfg, len);
@@ -259,7 +264,7 @@ static void fdp_nci_i2c_read_device_properties(struct device *dev,
dev_dbg(dev, "FW vendor specific commands not present\n");
*fw_vsc_cfg = NULL;
}
-
+out:
dev_dbg(dev, "Clock type: %d, clock frequency: %d, VSC: %s",
*clock_type, *clock_freq, *fw_vsc_cfg != NULL ? "yes" : "no");
}
--
2.34.1
next prev parent reply other threads:[~2023-02-27 1:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-26 9:59 [PATCH] nfc: fdp: add null check of devm_kmalloc_array in fdp_nci_i2c_read_device_properties Kang Chen
2023-02-26 15:33 ` Simon Horman
2023-02-27 1:26 ` Kang Chen
2023-02-27 1:41 ` Kang Chen [this message]
2023-02-27 8:02 ` [PATCH v2] " Krzysztof Kozlowski
2023-02-27 9:30 ` [PATCH v3] " void0red
2023-02-27 9:44 ` Krzysztof Kozlowski
2023-02-27 12:12 ` Simon Horman
2023-02-28 11:00 ` patchwork-bot+netdevbpf
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=20230227014144.1466102-1-void0red@gmail.com \
--to=void0red@gmail.com \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=simon.horman@corigine.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;
as well as URLs for NNTP newsgroup(s).