ACK: [SRU][Impish][PATCH 1/1] HID: amd_sfh: Fix potential NULL pointer dereference

[Stefan Bader]

On 13.01.22 00:41, Matthew Ruffell wrote:
> From: Basavaraj Natikar <Basavaraj.Natikar at amd.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1956519
> 
> 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: d46ef750ed58 ("HID: amd_sfh: Fix potential NULL pointer dereference")
> Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar at amd.com>
> Signed-off-by: Jiri Kosina <jkosina at suse.cz>
> (cherry picked from commit 88a04049c08cd62e698bc1b1af2d09574b9e0aee)
> Signed-off-by: Matthew Ruffell <matthew.ruffell at canonical.com>
Acked-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>   drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 12 ++++--------
>   1 file changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
> index 7af157b09a52..428f3a02f7db 100644
> --- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
> +++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
> @@ -235,21 +235,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 const struct pci_device_id amd_mp2_pci_tbl[] = {
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20220113/92ae6c5c/attachment.sig>