Commit 88a04049 authored by Basavaraj Natikar's avatar Basavaraj Natikar Committed by Jiri Kosina
Browse files

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: d46ef750 ("HID: amd_sfh: Fix potential NULL pointer dereference")
Signed-off-by: default avatarBasavaraj Natikar <Basavaraj.Natikar@amd.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 22d65765

drivers/hid/amd-sfh-hid/amd_sfh_pcie.c

+4 −8
Original line number Diff line number Diff line
@@ -251,21 +251,17 @@ 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;



	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)

		return rc;



	mp2_select_ops(privdata);



	return 0;

	return devm_add_action_or_reset(&pdev->dev, amd_mp2_pci_remove, privdata);

}



static int __maybe_unused amd_mp2_pci_resume(struct device *dev)