diff options
| author | Evgeny Novikov <novikov@ispras.ru> | 2021-06-01 19:38:01 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-09-16 09:14:33 +0200 |
| commit | d46ef750ed58cbeeba2d9a55c99231c30a172764 (patch) | |
| tree | 5b7fcf867cc478d46b47fb1726e82d637bba5dcb /drivers/hid/amd-sfh-hid | |
| parent | 0c8fbaa553077630e8eae45bd9676cfc01836aeb (diff) | |
| download | linux-d46ef750ed58cbeeba2d9a55c99231c30a172764.tar.bz2 | |
HID: amd_sfh: Fix potential NULL pointer dereference
devm_add_action_or_reset() can suddenly invoke amd_mp2_pci_remove() at
registration that will cause NULL pointer dereference since
corresponding data is not initialized yet. The patch moves
initialization of data before devm_add_action_or_reset().
Found by Linux Driver Verification project (linuxtesting.org).
[jkosina@suse.cz: rebase]
Signed-off-by: Evgeny Novikov <novikov@ispras.ru>
Acked-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/amd-sfh-hid')
| -rw-r--r-- | drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c index 79b138fd4261..9a1824757aae 100644 --- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c +++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c @@ -251,6 +251,10 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i return rc; } + rc = amd_sfh_hid_client_init(privdata); + if (rc) + return rc; + privdata->cl_data = devm_kzalloc(&pdev->dev, sizeof(struct amdtp_cl_data), GFP_KERNEL); if (!privdata->cl_data) return -ENOMEM; @@ -261,7 +265,7 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i mp2_select_ops(privdata); - return amd_sfh_hid_client_init(privdata); + return 0; } static int __maybe_unused amd_mp2_pci_resume(struct device *dev) |