Commit d46ef750 authored by Evgeny Novikov's avatar Evgeny Novikov Committed by Jiri Kosina
Browse files

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: default avatarEvgeny Novikov <novikov@ispras.ru>
Acked-by: default avatarBasavaraj Natikar <Basavaraj.Natikar@amd.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 0c8fbaa5

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

+5 −1
Original line number Diff line number Diff line
@@ -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)