devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Grant Likely <grant.likely@linaro.org>,
	Rob Herring <robh+dt@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Jakub Sitnicki <jsitnicki@gmail.com>,
	Vivek Goyal <vgoyal@redhat.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Jiang Liu <jiang.liu@linux.intel.com>,
	Mike Travis <travis@sgi.com>, Thierry Reding <treding@nvidia.com>,
	linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Subject: [PATCH v3 4/4] of/platform: Use platform_device interface
Date: Wed, 22 Apr 2015 18:14:21 +0200	[thread overview]
Message-ID: <1429719261-18024-5-git-send-email-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <1429719261-18024-1-git-send-email-ricardo.ribalda@gmail.com>

of_platform_device_create_pdata() was using of_device_add() to create
the devices, but of_platform_device_destroy was using
of_platform_device_destroy().

of_device_add(), do not call insert_resource(), which initializes the
parent field of the resource structure, needed by release_resource(),
called by of_platform_device_destroy().

This leads to a NULL pointer deference.

This patch, replaces of_device_add() with platform_device_data().

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 drivers/of/platform.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index a01f57c..f011f57 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -183,8 +183,9 @@ static struct platform_device *of_platform_device_create_pdata(
 	dev->dev.bus = &platform_bus_type;
 	dev->dev.platform_data = platform_data;
 	of_dma_configure(&dev->dev, dev->dev.of_node);
+	dev->name = dev_name(&dev->dev);
 
-	if (of_device_add(dev) != 0) {
+	if (platform_device_add(dev) != 0) {
 		of_dma_deconfigure(&dev->dev);
 		platform_device_put(dev);
 		goto err_clear_flag;
-- 
2.1.4

  parent reply	other threads:[~2015-04-22 16:14 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-22 16:14 [PATCH v3 0/4] Fix null pointer deference when calling of_platform_depopulate Ricardo Ribalda Delgado
2015-04-22 16:14 ` [PATCH v3 1/4] kernel/resource: Invalid memory access in __release_resource Ricardo Ribalda Delgado
2015-04-22 16:47   ` Bjorn Helgaas
     [not found]     ` <20150422164701.GJ20701-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2015-04-23  8:06       ` Ricardo Ribalda Delgado
2015-04-22 16:14 ` [PATCH v3 2/4] base/platform: Only insert MEM and IO resources Ricardo Ribalda Delgado
2015-04-22 16:14 ` [PATCH v3 3/4] base/platform: Continue on insert_resource() error Ricardo Ribalda Delgado
     [not found]   ` <1429719261-18024-4-git-send-email-ricardo.ribalda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-04-22 16:44     ` Bjorn Helgaas
     [not found]       ` <20150422164457.GI20701-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2015-04-23  7:55         ` Ricardo Ribalda Delgado
2015-04-23 13:26           ` Bjorn Helgaas
     [not found]             ` <20150423132637.GK20701-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2015-04-23 16:54               ` Thierry Reding
2015-04-22 16:14 ` Ricardo Ribalda Delgado [this message]
     [not found]   ` <1429719261-18024-5-git-send-email-ricardo.ribalda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-04-22 16:25     ` [PATCH v3 4/4] of/platform: Use platform_device interface Rob Herring
2015-04-23  7:28       ` Ricardo Ribalda Delgado
     [not found]         ` <CAPybu_3Ej2ecFDTiJVL9TfE=ZLFN2wLKE_nFL2WjMQtk+4LO_A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-04-23 13:49           ` Ricardo Ribalda Delgado
2015-05-24 19:29     ` [PATCH v3.1 " Greg Kroah-Hartman
     [not found]       ` <20150524192915.GA7170-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2015-05-26  7:26         ` Ricardo Ribalda Delgado

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=1429719261-18024-5-git-send-email-ricardo.ribalda@gmail.com \
    --to=ricardo.ribalda@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=bhelgaas@google.com \
    --cc=devicetree@vger.kernel.org \
    --cc=grant.likely@linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jiang.liu@linux.intel.com \
    --cc=jsitnicki@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=travis@sgi.com \
    --cc=treding@nvidia.com \
    --cc=vgoyal@redhat.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).