HID: amd_sfh: Fix potential NULL pointer dereference

The cl_data field of a privdata must be allocated and updated before
using in amd_sfh_hid_client_init() function.

Hence handling NULL pointer cl_data accordingly.

Fixes: d46ef750ed ("HID: amd_sfh: Fix potential NULL pointer dereference")
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Basavaraj Natikar 2021-09-23 17:59:27 +05:30 коммит произвёл Jiri Kosina
Родитель 22d65765f2
Коммит 88a04049c0
1 изменённых файлов: 4 добавлений и 8 удалений

Просмотреть файл

@ -251,21 +251,17 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
return rc; 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); privdata->cl_data = devm_kzalloc(&pdev->dev, sizeof(struct amdtp_cl_data), GFP_KERNEL);
if (!privdata->cl_data) if (!privdata->cl_data)
return -ENOMEM; return -ENOMEM;
rc = devm_add_action_or_reset(&pdev->dev, amd_mp2_pci_remove, privdata); mp2_select_ops(privdata);
rc = amd_sfh_hid_client_init(privdata);
if (rc) if (rc)
return rc; return rc;
mp2_select_ops(privdata); return devm_add_action_or_reset(&pdev->dev, amd_mp2_pci_remove, privdata);
return 0;
} }
static int __maybe_unused amd_mp2_pci_resume(struct device *dev) static int __maybe_unused amd_mp2_pci_resume(struct device *dev)