| From 7c02dc27f625a1ea5d6d7dcd961107ca48c27747 Mon Sep 17 00:00:00 2001 |
| From: Pan Bian <bianpan2016@163.com> |
| Date: Tue, 5 Nov 2019 16:34:07 +0800 |
| Subject: [PATCH] NFC: fdp: fix incorrect free object |
| |
| commit 517ce4e93368938b204451285e53014549804868 upstream. |
| |
| The address of fw_vsc_cfg is on stack. Releasing it with devm_kfree() is |
| incorrect, which may result in a system crash or other security impacts. |
| The expected object to free is *fw_vsc_cfg. |
| |
| Signed-off-by: Pan Bian <bianpan2016@163.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c |
| index 1cd113c8d7cb..ad0abb1f0bae 100644 |
| --- a/drivers/nfc/fdp/i2c.c |
| +++ b/drivers/nfc/fdp/i2c.c |
| @@ -259,7 +259,7 @@ static void fdp_nci_i2c_read_device_properties(struct device *dev, |
| *fw_vsc_cfg, len); |
| |
| if (r) { |
| - devm_kfree(dev, fw_vsc_cfg); |
| + devm_kfree(dev, *fw_vsc_cfg); |
| goto vsc_read_err; |
| } |
| } else { |
| -- |
| 2.7.4 |
| |