From: Rob Herring <robherring2@gmail.com> To: Suman Anna <s-anna@ti.com> Cc: Grant Likely <grant.likely@linaro.org>, Rob Herring <robh+dt@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Pawel Moll <pawel.moll@arm.com>, Pantelis Antoniou <pantelis.antoniou@konsulko.com>, Felipe Balbi <balbi@ti.com>, "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, linux-omap <linux-omap@vger.kernel.org> Subject: Re: [RFC PATCH 2/3] core: platform: fix an invalid kfree during of_platform_depopulate Date: Tue, 13 Jan 2015 16:27:48 -0600 [thread overview] Message-ID: <CAL_JsqK8ZAUZwd1zjjZ57MQZ+KD-_qiCyMXnhQ-zZ38wxUtf-g@mail.gmail.com> (raw) In-Reply-To: <1420651854-17768-3-git-send-email-s-anna@ti.com> On Wed, Jan 7, 2015 at 11:30 AM, Suman Anna <s-anna@ti.com> wrote: > Drivers can use of_platform_populate() to create platform devices > for children of the device main node, and a complementary API > of_platform_depopulate() is provided to delete these child devices. > Any platform_data supplied for the OF devices through auxdata lookup > data is populated directly in the device's platform_data field, unlike > those created using platform API. The of_platform_depopulate() > leverages the platform code for cleanup, and this will result in a > kernel oops due to an invalid kfree on this direct populated > platform_data. > > Fix this by resetting the platform data for OF devices during > platform device cleanup. We should probably copy the platform_data like is done for non-OF platform devices. I'm sure there was some reason for it. It looks strange doing this in release. However, I'm inclined to not fix this and force users to move off of auxdata. That's intended to be a temporary migration path and there are only 54 instances of it that have platform_data. What device do you care about? Rob > > Signed-off-by: Suman Anna <s-anna@ti.com> > --- > drivers/base/platform.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/base/platform.c b/drivers/base/platform.c > index 9421fed40905..129e69c8c894 100644 > --- a/drivers/base/platform.c > +++ b/drivers/base/platform.c > @@ -200,6 +200,8 @@ static void platform_device_release(struct device *dev) > struct platform_object *pa = container_of(dev, struct platform_object, > pdev.dev); > > + if (pa->pdev.dev.of_node) > + pa->pdev.dev.platform_data = NULL; > of_device_node_put(&pa->pdev.dev); > kfree(pa->pdev.dev.platform_data); > kfree(pa->pdev.mfd_cell); > -- > 2.2.1 >
WARNING: multiple messages have this Message-ID (diff)
From: robherring2@gmail.com (Rob Herring) To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 2/3] core: platform: fix an invalid kfree during of_platform_depopulate Date: Tue, 13 Jan 2015 16:27:48 -0600 [thread overview] Message-ID: <CAL_JsqK8ZAUZwd1zjjZ57MQZ+KD-_qiCyMXnhQ-zZ38wxUtf-g@mail.gmail.com> (raw) In-Reply-To: <1420651854-17768-3-git-send-email-s-anna@ti.com> On Wed, Jan 7, 2015 at 11:30 AM, Suman Anna <s-anna@ti.com> wrote: > Drivers can use of_platform_populate() to create platform devices > for children of the device main node, and a complementary API > of_platform_depopulate() is provided to delete these child devices. > Any platform_data supplied for the OF devices through auxdata lookup > data is populated directly in the device's platform_data field, unlike > those created using platform API. The of_platform_depopulate() > leverages the platform code for cleanup, and this will result in a > kernel oops due to an invalid kfree on this direct populated > platform_data. > > Fix this by resetting the platform data for OF devices during > platform device cleanup. We should probably copy the platform_data like is done for non-OF platform devices. I'm sure there was some reason for it. It looks strange doing this in release. However, I'm inclined to not fix this and force users to move off of auxdata. That's intended to be a temporary migration path and there are only 54 instances of it that have platform_data. What device do you care about? Rob > > Signed-off-by: Suman Anna <s-anna@ti.com> > --- > drivers/base/platform.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/base/platform.c b/drivers/base/platform.c > index 9421fed40905..129e69c8c894 100644 > --- a/drivers/base/platform.c > +++ b/drivers/base/platform.c > @@ -200,6 +200,8 @@ static void platform_device_release(struct device *dev) > struct platform_object *pa = container_of(dev, struct platform_object, > pdev.dev); > > + if (pa->pdev.dev.of_node) > + pa->pdev.dev.platform_data = NULL; > of_device_node_put(&pa->pdev.dev); > kfree(pa->pdev.dev.platform_data); > kfree(pa->pdev.mfd_cell); > -- > 2.2.1 >
next prev parent reply other threads:[~2015-01-13 22:28 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-07 17:30 [RFC PATCH 0/3] of_platform_depopulate crash fixes Suman Anna 2015-01-07 17:30 ` Suman Anna 2015-01-07 17:30 ` Suman Anna 2015-01-07 17:30 ` [RFC PATCH 1/3] of/device: manage resources similar to platform_device_add Suman Anna 2015-01-07 17:30 ` Suman Anna 2015-01-07 17:30 ` Suman Anna 2015-01-13 20:38 ` Rob Herring 2015-01-13 20:38 ` Rob Herring 2015-01-13 20:38 ` Rob Herring 2015-01-13 21:25 ` Suman Anna 2015-01-13 21:25 ` Suman Anna 2015-01-13 21:25 ` Suman Anna 2015-01-13 22:00 ` Rob Herring 2015-01-13 22:00 ` Rob Herring 2015-01-13 22:00 ` Rob Herring 2015-01-13 23:04 ` Suman Anna 2015-01-13 23:04 ` Suman Anna 2015-01-13 23:04 ` Suman Anna 2015-01-22 21:49 ` Suman Anna 2015-01-22 21:49 ` Suman Anna 2015-01-22 21:49 ` Suman Anna 2015-03-20 11:29 ` Grant Likely 2015-03-20 11:29 ` Grant Likely 2015-03-20 11:29 ` Grant Likely 2015-01-07 17:30 ` [RFC PATCH 2/3] core: platform: fix an invalid kfree during of_platform_depopulate Suman Anna 2015-01-07 17:30 ` Suman Anna 2015-01-07 17:30 ` Suman Anna 2015-01-13 22:27 ` Rob Herring [this message] 2015-01-13 22:27 ` Rob Herring 2015-01-13 22:27 ` Rob Herring 2015-01-13 22:53 ` Suman Anna 2015-01-13 22:53 ` Suman Anna 2015-01-13 22:53 ` Suman Anna 2015-01-07 17:30 ` [RFC PATCH 3/3] of/unittest: fix trailing semi-colons on conditional selftest Suman Anna 2015-01-07 17:30 ` Suman Anna 2015-01-07 17:30 ` Suman Anna
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAL_JsqK8ZAUZwd1zjjZ57MQZ+KD-_qiCyMXnhQ-zZ38wxUtf-g@mail.gmail.com \ --to=robherring2@gmail.com \ --cc=balbi@ti.com \ --cc=devicetree@vger.kernel.org \ --cc=grant.likely@linaro.org \ --cc=gregkh@linuxfoundation.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=pantelis.antoniou@konsulko.com \ --cc=pawel.moll@arm.com \ --cc=robh+dt@kernel.org \ --cc=s-anna@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.