Re: [PATCH] uio_pdrv: fix memory leak and license specification.

Re: [PATCH] uio_pdrv: fix memory leak and license specification.

[Hans J. Koch]

On Wed, Jul 09, 2008 at 08:13:23AM +0200, Uwe Kleine-König wrote:
> Thanks to Magnus Damm for pointing that out.

Yep, good catch.

Thanks,
Hans

> 
> Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Acked-by: Hans J. Koch <hjk@linutronix.de>

> ---
> Hi,
> 
> Greg, this bases on uio-add-generic-uio-platform-driver.patch that is
> already in your queue.
> 
> IMHO the best is to squash these two patches together.  Can you do that?
> 
> Best regards
> Uwe
> 
>  drivers/uio/uio_pdrv.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
> index 5d0d2e8..0b4ef39 100644
> --- a/drivers/uio/uio_pdrv.c
> +++ b/drivers/uio/uio_pdrv.c
> @@ -88,6 +88,8 @@ static int uio_pdrv_remove(struct platform_device *pdev)
>  
>  	uio_unregister_device(pdata->uioinfo);
>  
> +	kfree(pdata);
> +
>  	return 0;
>  }
>  
> @@ -114,5 +116,5 @@ module_exit(uio_pdrv_exit);
>  
>  MODULE_AUTHOR("Uwe Kleine-Koenig");
>  MODULE_DESCRIPTION("Userspace I/O platform driver");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
>  MODULE_ALIAS("platform:" DRIVER_NAME);
> -- 
> 1.5.6

[PATCH 0/2] uio_pdrv updates

[Uwe Kleine-König]

Hello,

I have the following updates to the uio_pdrv driver currently in Greg's
queue:

Uwe Kleine-König (2):
      uio_pdrv: fix memory leak
      uio_pdrv: fix license specification

 drivers/uio/uio_pdrv.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

I send them as a reply to this mail.

I already sent the two in a single patch.  The squashed patch was
Acked-by: Hans, so I added his Acked-by: to both patches.

Actually I don't care if they go in as one or two changesets or if they
are both squashed onto the original patch.  Do whatever is easier for
you.

Best regards
Uwe

[PATCH 1/2] uio_pdrv: fix memory leak

[Uwe Kleine-König]

Thanks to Magnus Damm for pointing that out.

Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Acked-by: Hans J. Koch <hjk@linutronix.de>
---
 drivers/uio/uio_pdrv.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
index 5d0d2e8..aa3bff8 100644
--- a/drivers/uio/uio_pdrv.c
+++ b/drivers/uio/uio_pdrv.c
@@ -88,6 +88,8 @@ static int uio_pdrv_remove(struct platform_device *pdev)
 
 	uio_unregister_device(pdata->uioinfo);
 
+	kfree(pdata);
+
 	return 0;
 }
 
-- 
1.5.6.2

[PATCH 2/2] uio_pdrv: fix license specification

[Uwe Kleine-König]

Thanks to Magnus Damm for pointing that out.

Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Acked-by: Hans J. Koch <hjk@linutronix.de>
---
 drivers/uio/uio_pdrv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
index aa3bff8..0b4ef39 100644
--- a/drivers/uio/uio_pdrv.c
+++ b/drivers/uio/uio_pdrv.c
@@ -116,5 +116,5 @@ module_exit(uio_pdrv_exit);
 
 MODULE_AUTHOR("Uwe Kleine-Koenig");
 MODULE_DESCRIPTION("Userspace I/O platform driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" DRIVER_NAME);
-- 
1.5.6.2

patch uio-uio_pdrv-fix-license-specification.patch added to gregkh-2.6 tree

[gregkh]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1641 bytes --]


This is a note to let you know that I've just added the patch titled

    Subject: UIO: uio_pdrv: fix license specification

to my gregkh-2.6 tree.  Its filename is

    uio-uio_pdrv-fix-license-specification.patch

This tree can be found at 
    http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/


>From Uwe.Kleine-Koenig@digi.com  Wed Aug 20 13:45:09 2008
From: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Date: Fri, 11 Jul 2008 11:10:37 +0200
Subject: UIO: uio_pdrv: fix license specification
To: Greg KH <greg@kroah.com>, "Hans J. Koch" <hjk@linutronix.de>
Cc: Magnus Damm <magnus.damm@gmail.com>, <linux-kernel@vger.kernel.org>
Message-ID: <1215767437-20583-3-git-send-email-Uwe.Kleine-Koenig@digi.com>


Thanks to Magnus Damm for pointing that out.

Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Acked-by: Hans J. Koch <hjk@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/uio/uio_pdrv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/uio/uio_pdrv.c
+++ b/drivers/uio/uio_pdrv.c
@@ -116,5 +116,5 @@ module_exit(uio_pdrv_exit);
 
 MODULE_AUTHOR("Uwe Kleine-Koenig");
 MODULE_DESCRIPTION("Userspace I/O platform driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" DRIVER_NAME);


Patches currently in gregkh-2.6 which might be from Uwe.Kleine-Koenig@digi.com are

driver-core.current/uio-uio_pdrv-fix-license-specification.patch
driver-core.current/uio-uio_pdrv-fix-memory-leak.patch
driver-core.current/uio-generic-irq-handling-for-some-uio-platform-devices.patch

patch uio-uio_pdrv-fix-memory-leak.patch added to gregkh-2.6 tree

[gregkh]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1504 bytes --]


This is a note to let you know that I've just added the patch titled

    Subject: UIO: uio_pdrv: fix memory leak

to my gregkh-2.6 tree.  Its filename is

    uio-uio_pdrv-fix-memory-leak.patch

This tree can be found at 
    http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/


>From Uwe.Kleine-Koenig@digi.com  Wed Aug 20 13:44:18 2008
From: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Date: Fri, 11 Jul 2008 11:10:36 +0200
Subject: UIO: uio_pdrv: fix memory leak
To: Greg KH <greg@kroah.com>, "Hans J. Koch" <hjk@linutronix.de>
Cc: Magnus Damm <magnus.damm@gmail.com>, <linux-kernel@vger.kernel.org>
Message-ID: <1215767437-20583-2-git-send-email-Uwe.Kleine-Koenig@digi.com>


Thanks to Magnus Damm for pointing that out.

Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Acked-by: Hans J. Koch <hjk@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/uio/uio_pdrv.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/drivers/uio/uio_pdrv.c
+++ b/drivers/uio/uio_pdrv.c
@@ -88,6 +88,8 @@ static int uio_pdrv_remove(struct platfo
 
 	uio_unregister_device(pdata->uioinfo);
 
+	kfree(pdata);
+
 	return 0;
 }
 


Patches currently in gregkh-2.6 which might be from Uwe.Kleine-Koenig@digi.com are

driver-core.current/uio-uio_pdrv-fix-license-specification.patch
driver-core.current/uio-uio_pdrv-fix-memory-leak.patch
driver-core.current/uio-generic-irq-handling-for-some-uio-platform-devices.patch