Hi Greg,
Please pull this change for drivers/mcb.
Thanks
Johannes
--
The following changes since commit 9e897e13bd46fa03485468609741974259a8c573:
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd (2014-04-10 14:33:02 -0700)
are available in the git repository at:
git://github.com/morbidrsa/linux.git mcb
for you to fetch changes up to e383c2430770c4bb080b4915826f34b729b33bbc:
drivers: mcb: fix memory leak in chameleon_parse_cells() error path (2014-04-11 08:37:37 +0200)
----------------------------------------------------------------
Christoph Jaeger (1):
drivers: mcb: fix memory leak in chameleon_parse_cells() error path
drivers/mcb/mcb-parse.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mcb/mcb-parse.c b/drivers/mcb/mcb-parse.c
index d1278b5..0049269 100644
--- a/drivers/mcb/mcb-parse.c
+++ b/drivers/mcb/mcb-parse.c
@@ -141,6 +141,7 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase,
default:
pr_err("Invalid chameleon descriptor type 0x%x\n",
dtype);
+ kfree(header);
return -EINVAL;
}
num_cells++;
On Fri, Apr 11, 2014 at 08:48:40AM +0200, Johannes Thumshirn wrote:
> Hi Greg,
>
> Please pull this change for drivers/mcb.
>
> Thanks
> Johannes
>
> --
>
> The following changes since commit 9e897e13bd46fa03485468609741974259a8c573:
>
> Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd (2014-04-10 14:33:02 -0700)
>
> are available in the git repository at:
>
>
> git://github.com/morbidrsa/linux.git mcb
>
> for you to fetch changes up to e383c2430770c4bb080b4915826f34b729b33bbc:
>
> drivers: mcb: fix memory leak in chameleon_parse_cells() error path (2014-04-11 08:37:37 +0200)
I really don't like taking git pull requests, and will not take one from
a non-kernel.org tree, nor one without a signed tag.
For just a single patch like this, just send it through email. Much
faster and simpler.
Oh, and go get a kernel.org account :)
thanks,
greg k-h
On Fri, Apr 11, 2014 at 07:16:34AM -0700, Greg Kroah-Hartman wrote:
> On Fri, Apr 11, 2014 at 08:48:40AM +0200, Johannes Thumshirn wrote:
> > Hi Greg,
> >
> > Please pull this change for drivers/mcb.
> >
> > Thanks
> > Johannes
> >
> > --
> >
> > The following changes since commit 9e897e13bd46fa03485468609741974259a8c573:
> >
> > Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd (2014-04-10 14:33:02 -0700)
> >
> > are available in the git repository at:
> >
> >
> > git://github.com/morbidrsa/linux.git mcb
> >
> > for you to fetch changes up to e383c2430770c4bb080b4915826f34b729b33bbc:
> >
> > drivers: mcb: fix memory leak in chameleon_parse_cells() error path (2014-04-11 08:37:37 +0200)
>
> I really don't like taking git pull requests, and will not take one from
> a non-kernel.org tree, nor one without a signed tag.
>
> For just a single patch like this, just send it through email. Much
> faster and simpler.
>
OK, comming right away.
> Oh, and go get a kernel.org account :)
>
OK, I'll do my best.
> thanks,
>
> greg k-h
Nice Weekend,
Johannes