This is a note to let you know that I've just added the patch titled
nfc: fdp: add null check of devm_kmalloc_array in fdp_nci_i2c_read_device_properties
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfc-fdp-add-null-check-of-devm_kmalloc_array-in-fdp_nci_i2c_read_device_properties.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 11f180a5d62a51b484e9648f9b310e1bd50b1a57 Mon Sep 17 00:00:00 2001
From: Kang Chen <void0red@xxxxxxxxx>
Date: Mon, 27 Feb 2023 17:30:37 +0800
Subject: nfc: fdp: add null check of devm_kmalloc_array in fdp_nci_i2c_read_device_properties
From: Kang Chen <void0red@xxxxxxxxx>
commit 11f180a5d62a51b484e9648f9b310e1bd50b1a57 upstream.
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@xxxxxxxxx>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Reviewed-by: Simon Horman <simon.horman@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230227093037.907654-1-void0red@xxxxxxxxx
Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/nfc/fdp/i2c.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/drivers/nfc/fdp/i2c.c
+++ b/drivers/nfc/fdp/i2c.c
@@ -263,6 +263,9 @@ static void fdp_nci_i2c_read_device_prop
len, sizeof(**fw_vsc_cfg),
GFP_KERNEL);
+ if (!*fw_vsc_cfg)
+ goto alloc_err;
+
r = device_property_read_u8_array(dev, FDP_DP_FW_VSC_CFG_NAME,
*fw_vsc_cfg, len);
@@ -276,6 +279,7 @@ vsc_read_err:
*fw_vsc_cfg = NULL;
}
+alloc_err:
dev_dbg(dev, "Clock type: %d, clock frequency: %d, VSC: %s",
*clock_type, *clock_freq, *fw_vsc_cfg != NULL ? "yes" : "no");
}
Patches currently in stable-queue which might be from void0red@xxxxxxxxx are
queue-4.19/nfc-fdp-add-null-check-of-devm_kmalloc_array-in-fdp_nci_i2c_read_device_properties.patch
