* [PATCH] HID: amd_sfh: Add missing check for dma_alloc_coherent
@ 2022-12-20 2:49 Jiasheng Jiang
2022-12-20 6:52 ` Basavaraj Natikar
0 siblings, 1 reply; 3+ messages in thread
From: Jiasheng Jiang @ 2022-12-20 2:49 UTC (permalink / raw)
To: basavaraj.natikar, jikos, benjamin.tissoires
Cc: linux-input, linux-kernel, Jiasheng Jiang
Add check for the return value of the dma_alloc_coherent since
it may return NULL pointer if allocation fails.
Fixes: 4b2c53d93a4b ("SFH:Transport Driver to add support of AMD Sensor Fusion Hub (SFH)")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
---
drivers/hid/amd-sfh-hid/amd_sfh_client.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_client.c b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
index 8275bba63611..ab125f79408f 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_client.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
@@ -237,6 +237,10 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
in_data->sensor_virt_addr[i] = dma_alloc_coherent(dev, sizeof(int) * 8,
&cl_data->sensor_dma_addr[i],
GFP_KERNEL);
+ if (!in_data->sensor_virt_addr[i]) {
+ rc = -ENOMEM;
+ goto cleanup;
+ }
cl_data->sensor_sts[i] = SENSOR_DISABLED;
cl_data->sensor_requested_cnt[i] = 0;
cl_data->cur_hid_dev = i;
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] HID: amd_sfh: Add missing check for dma_alloc_coherent
2022-12-20 2:49 [PATCH] HID: amd_sfh: Add missing check for dma_alloc_coherent Jiasheng Jiang
@ 2022-12-20 6:52 ` Basavaraj Natikar
2022-12-20 10:47 ` Benjamin Tissoires
0 siblings, 1 reply; 3+ messages in thread
From: Basavaraj Natikar @ 2022-12-20 6:52 UTC (permalink / raw)
To: Jiasheng Jiang, basavaraj.natikar, jikos, benjamin.tissoires
Cc: linux-input, linux-kernel
On 12/20/2022 8:19 AM, Jiasheng Jiang wrote:
> Add check for the return value of the dma_alloc_coherent since
> it may return NULL pointer if allocation fails.
>
> Fixes: 4b2c53d93a4b ("SFH:Transport Driver to add support of AMD Sensor Fusion Hub (SFH)")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> ---
> drivers/hid/amd-sfh-hid/amd_sfh_client.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_client.c b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
> index 8275bba63611..ab125f79408f 100644
> --- a/drivers/hid/amd-sfh-hid/amd_sfh_client.c
> +++ b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
> @@ -237,6 +237,10 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
> in_data->sensor_virt_addr[i] = dma_alloc_coherent(dev, sizeof(int) * 8,
> &cl_data->sensor_dma_addr[i],
> GFP_KERNEL);
> + if (!in_data->sensor_virt_addr[i]) {
> + rc = -ENOMEM;
> + goto cleanup;
> + }
> cl_data->sensor_sts[i] = SENSOR_DISABLED;
> cl_data->sensor_requested_cnt[i] = 0;
> cl_data->cur_hid_dev = i;
looks good to me.
Acked-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Thanks,
--
Basavaraj
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] HID: amd_sfh: Add missing check for dma_alloc_coherent
2022-12-20 6:52 ` Basavaraj Natikar
@ 2022-12-20 10:47 ` Benjamin Tissoires
0 siblings, 0 replies; 3+ messages in thread
From: Benjamin Tissoires @ 2022-12-20 10:47 UTC (permalink / raw)
To: Basavaraj Natikar
Cc: Jiasheng Jiang, basavaraj.natikar, jikos, linux-input,
linux-kernel
On Tue, Dec 20, 2022 at 7:53 AM Basavaraj Natikar <bnatikar@amd.com> wrote:
>
>
> On 12/20/2022 8:19 AM, Jiasheng Jiang wrote:
> > Add check for the return value of the dma_alloc_coherent since
> > it may return NULL pointer if allocation fails.
> >
> > Fixes: 4b2c53d93a4b ("SFH:Transport Driver to add support of AMD Sensor Fusion Hub (SFH)")
> > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> > ---
> > drivers/hid/amd-sfh-hid/amd_sfh_client.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_client.c b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
> > index 8275bba63611..ab125f79408f 100644
> > --- a/drivers/hid/amd-sfh-hid/amd_sfh_client.c
> > +++ b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
> > @@ -237,6 +237,10 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
> > in_data->sensor_virt_addr[i] = dma_alloc_coherent(dev, sizeof(int) * 8,
> > &cl_data->sensor_dma_addr[i],
> > GFP_KERNEL);
> > + if (!in_data->sensor_virt_addr[i]) {
> > + rc = -ENOMEM;
> > + goto cleanup;
> > + }
> > cl_data->sensor_sts[i] = SENSOR_DISABLED;
> > cl_data->sensor_requested_cnt[i] = 0;
> > cl_data->cur_hid_dev = i;
>
> looks good to me.
>
> Acked-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Thanks.
I have now applied this patch to hid.git branch for-6.2/upstream-fixes.
Cheers,
Benjamin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-20 10:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-20 2:49 [PATCH] HID: amd_sfh: Add missing check for dma_alloc_coherent Jiasheng Jiang
2022-12-20 6:52 ` Basavaraj Natikar
2022-12-20 10:47 ` Benjamin Tissoires
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).