diff mbox series

HID: hyperv: NULL check before some freeing functions is not needed.

Message ID 20200229173007.61838-1-tanure@linux.com (mailing list archive)
State Mainlined
Commit 5313b2a58ef02e2b077d7ae8088043609e3155b0
Delegated to: Jiri Kosina
Headers show
Series HID: hyperv: NULL check before some freeing functions is not needed. | expand

Commit Message

Lucas Tanure Feb. 29, 2020, 5:30 p.m. UTC
Fix below warnings reported by coccicheck:
drivers/hid/hid-hyperv.c:197:2-7: WARNING: NULL check before some freeing functions is not needed.
drivers/hid/hid-hyperv.c:211:2-7: WARNING: NULL check before some freeing functions is not needed.

Signed-off-by: Lucas Tanure <tanure@linux.com>
---
 drivers/hid/hid-hyperv.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Michael Kelley (LINUX) Feb. 29, 2020, 8:20 p.m. UTC | #1
From: Lucas Tanure <tanure@linux.com> Sent: Saturday, February 29, 2020 9:30 AM
> 
> Fix below warnings reported by coccicheck:
> drivers/hid/hid-hyperv.c:197:2-7: WARNING: NULL check before some freeing functions is
> not needed.
> drivers/hid/hid-hyperv.c:211:2-7: WARNING: NULL check before some freeing functions is
> not needed.
> 
> Signed-off-by: Lucas Tanure <tanure@linux.com>

Reviewed-by: Michael Kelley <mikelley@microsoft.com>

> ---
>  drivers/hid/hid-hyperv.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
> index dddfca555df9..0b6ee1dee625 100644
> --- a/drivers/hid/hid-hyperv.c
> +++ b/drivers/hid/hid-hyperv.c
> @@ -193,8 +193,7 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev
> *input_device,
>  		goto cleanup;
> 
>  	/* The pointer is not NULL when we resume from hibernation */
> -	if (input_device->hid_desc != NULL)
> -		kfree(input_device->hid_desc);
> +	kfree(input_device->hid_desc);
>  	input_device->hid_desc = kmemdup(desc, desc->bLength, GFP_ATOMIC);
> 
>  	if (!input_device->hid_desc)
> @@ -207,8 +206,7 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev
> *input_device,
>  	}
> 
>  	/* The pointer is not NULL when we resume from hibernation */
> -	if (input_device->report_desc != NULL)
> -		kfree(input_device->report_desc);
> +	kfree(input_device->report_desc);
>  	input_device->report_desc = kzalloc(input_device->report_desc_size,
>  					  GFP_ATOMIC);
> 
> --
> 2.25.1
Wei Liu Feb. 29, 2020, 10:48 p.m. UTC | #2
On Sat, Feb 29, 2020 at 05:30:07PM +0000, Lucas Tanure wrote:
> Fix below warnings reported by coccicheck:
> drivers/hid/hid-hyperv.c:197:2-7: WARNING: NULL check before some freeing functions is not needed.
> drivers/hid/hid-hyperv.c:211:2-7: WARNING: NULL check before some freeing functions is not needed.
> 
> Signed-off-by: Lucas Tanure <tanure@linux.com>

Reviewed-by: Wei Liu <wei.liu@kernel.org>
Benjamin Tissoires March 2, 2020, 10:16 a.m. UTC | #3
On Sat, Feb 29, 2020 at 6:30 PM Lucas Tanure <tanure@linux.com> wrote:
>
> Fix below warnings reported by coccicheck:
> drivers/hid/hid-hyperv.c:197:2-7: WARNING: NULL check before some freeing functions is not needed.
> drivers/hid/hid-hyperv.c:211:2-7: WARNING: NULL check before some freeing functions is not needed.
>
> Signed-off-by: Lucas Tanure <tanure@linux.com>
> ---

Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

Sasha, do you prefer taking this through your tree or through the HID
one. I don't think we have much scheduled for hyperv, so it's up to
you.

Cheers,
Benjamin

>  drivers/hid/hid-hyperv.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
> index dddfca555df9..0b6ee1dee625 100644
> --- a/drivers/hid/hid-hyperv.c
> +++ b/drivers/hid/hid-hyperv.c
> @@ -193,8 +193,7 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
>                 goto cleanup;
>
>         /* The pointer is not NULL when we resume from hibernation */
> -       if (input_device->hid_desc != NULL)
> -               kfree(input_device->hid_desc);
> +       kfree(input_device->hid_desc);
>         input_device->hid_desc = kmemdup(desc, desc->bLength, GFP_ATOMIC);
>
>         if (!input_device->hid_desc)
> @@ -207,8 +206,7 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
>         }
>
>         /* The pointer is not NULL when we resume from hibernation */
> -       if (input_device->report_desc != NULL)
> -               kfree(input_device->report_desc);
> +       kfree(input_device->report_desc);
>         input_device->report_desc = kzalloc(input_device->report_desc_size,
>                                           GFP_ATOMIC);
>
> --
> 2.25.1
>
Wei Liu March 2, 2020, 12:09 p.m. UTC | #4
Hi Benjamin

On Mon, Mar 02, 2020 at 11:16:30AM +0100, Benjamin Tissoires wrote:
> On Sat, Feb 29, 2020 at 6:30 PM Lucas Tanure <tanure@linux.com> wrote:
> >
> > Fix below warnings reported by coccicheck:
> > drivers/hid/hid-hyperv.c:197:2-7: WARNING: NULL check before some freeing functions is not needed.
> > drivers/hid/hid-hyperv.c:211:2-7: WARNING: NULL check before some freeing functions is not needed.
> >
> > Signed-off-by: Lucas Tanure <tanure@linux.com>
> > ---
> 
> Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> 
> Sasha, do you prefer taking this through your tree or through the HID
> one. I don't think we have much scheduled for hyperv, so it's up to
> you.

Sasha stepped down as a hyperv maintainer a few days back. I will be
taking over maintenance of the hyperv tree.

The problem is at the moment I haven't got write access to the
repository hosted on git.kernel.org. That's something I will need to
sort out as soon as possible.

In the meantime, it would be great if you can pick up this patch so that
it doesn't get lost while I sort out access on my side.

Thanks,
Wei.
Wei Liu March 4, 2020, 2:48 p.m. UTC | #5
On Mon, Mar 02, 2020 at 12:09:51PM +0000, Wei Liu wrote:
> Hi Benjamin
> 
> On Mon, Mar 02, 2020 at 11:16:30AM +0100, Benjamin Tissoires wrote:
> > On Sat, Feb 29, 2020 at 6:30 PM Lucas Tanure <tanure@linux.com> wrote:
> > >
> > > Fix below warnings reported by coccicheck:
> > > drivers/hid/hid-hyperv.c:197:2-7: WARNING: NULL check before some freeing functions is not needed.
> > > drivers/hid/hid-hyperv.c:211:2-7: WARNING: NULL check before some freeing functions is not needed.
> > >
> > > Signed-off-by: Lucas Tanure <tanure@linux.com>
> > > ---
> > 
> > Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> > 
> > Sasha, do you prefer taking this through your tree or through the HID
> > one. I don't think we have much scheduled for hyperv, so it's up to
> > you.
> 
> Sasha stepped down as a hyperv maintainer a few days back. I will be
> taking over maintenance of the hyperv tree.
> 
> The problem is at the moment I haven't got write access to the
> repository hosted on git.kernel.org. That's something I will need to
> sort out as soon as possible.
> 
> In the meantime, it would be great if you can pick up this patch so that
> it doesn't get lost while I sort out access on my side.

Hi Benjamin

I got access to the Hyper-V tree. I will be picking this patch up since
I haven't got a confirmation from your side.

Wei.

> 
> Thanks,
> Wei.
Benjamin Tissoires March 4, 2020, 2:55 p.m. UTC | #6
On Wed, Mar 4, 2020 at 3:49 PM Wei Liu <wei.liu@kernel.org> wrote:
>
> On Mon, Mar 02, 2020 at 12:09:51PM +0000, Wei Liu wrote:
> > Hi Benjamin
> >
> > On Mon, Mar 02, 2020 at 11:16:30AM +0100, Benjamin Tissoires wrote:
> > > On Sat, Feb 29, 2020 at 6:30 PM Lucas Tanure <tanure@linux.com> wrote:
> > > >
> > > > Fix below warnings reported by coccicheck:
> > > > drivers/hid/hid-hyperv.c:197:2-7: WARNING: NULL check before some freeing functions is not needed.
> > > > drivers/hid/hid-hyperv.c:211:2-7: WARNING: NULL check before some freeing functions is not needed.
> > > >
> > > > Signed-off-by: Lucas Tanure <tanure@linux.com>
> > > > ---
> > >
> > > Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> > >
> > > Sasha, do you prefer taking this through your tree or through the HID
> > > one. I don't think we have much scheduled for hyperv, so it's up to
> > > you.
> >
> > Sasha stepped down as a hyperv maintainer a few days back. I will be
> > taking over maintenance of the hyperv tree.
> >
> > The problem is at the moment I haven't got write access to the
> > repository hosted on git.kernel.org. That's something I will need to
> > sort out as soon as possible.
> >
> > In the meantime, it would be great if you can pick up this patch so that
> > it doesn't get lost while I sort out access on my side.
>
> Hi Benjamin
>
> I got access to the Hyper-V tree. I will be picking this patch up since
> I haven't got a confirmation from your side.
>

Great, thanks.

Sorry, I am pulled in freedesktop tasks right now that are a little bit urgent.

Glad you quickly set up the access rights.

Cheers,
Benjamin
diff mbox series

Patch

diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
index dddfca555df9..0b6ee1dee625 100644
--- a/drivers/hid/hid-hyperv.c
+++ b/drivers/hid/hid-hyperv.c
@@ -193,8 +193,7 @@  static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
 		goto cleanup;
 
 	/* The pointer is not NULL when we resume from hibernation */
-	if (input_device->hid_desc != NULL)
-		kfree(input_device->hid_desc);
+	kfree(input_device->hid_desc);
 	input_device->hid_desc = kmemdup(desc, desc->bLength, GFP_ATOMIC);
 
 	if (!input_device->hid_desc)
@@ -207,8 +206,7 @@  static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
 	}
 
 	/* The pointer is not NULL when we resume from hibernation */
-	if (input_device->report_desc != NULL)
-		kfree(input_device->report_desc);
+	kfree(input_device->report_desc);
 	input_device->report_desc = kzalloc(input_device->report_desc_size,
 					  GFP_ATOMIC);