From: Tilman Schmidt <tilman@imap.cc>
To: Paul Bolle <pebolle@tiscali.nl>, netdev@vger.kernel.org
Cc: Peter Hurley <peter@hurleysoftware.com>,
Sasha Levin <sasha.levin@oracle.com>,
<syzkaller@googlegroups.com>, David Miller <davem@davemloft.net>,
Karsten Keil <isdn@linux-pingi.de>,
isdn4linux@listserv.isdn4linux.de,
<gigaset307x-common@lists.sourceforge.net>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH 2/3] ser_gigaset: fix deallocation of platform device structure
Date: Tue, 8 Dec 2015 12:00:33 +0100 (CET) [thread overview]
Message-ID: <83c4ab9bbca911aad62343154eabfa1af077b021.1449570042.git.tilman@imap.cc> (raw)
In-Reply-To: <cover.1449570042.git.tilman@imap.cc>
When shutting down the device, the struct ser_cardstate must not be
kfree()d immediately after the call to platform_device_unregister()
since the embedded struct platform_device is still in use.
Move the kfree() call to the release method instead.
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Fixes: 2869b23e4b95 ("drivers/isdn/gigaset: new M101 driver (v2)")
Reported-by: Sasha Levin <sasha.levin@oracle.com>
---
drivers/isdn/gigaset/ser-gigaset.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index d8771b5..2693cb2 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -370,19 +370,23 @@ static void gigaset_freecshw(struct cardstate *cs)
tasklet_kill(&cs->write_tasklet);
if (!cs->hw.ser)
return;
- dev_set_drvdata(&cs->hw.ser->dev.dev, NULL);
platform_device_unregister(&cs->hw.ser->dev);
- kfree(cs->hw.ser);
- cs->hw.ser = NULL;
}
static void gigaset_device_release(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
+ struct cardstate *cs = dev_get_drvdata(dev);
/* adapted from platform_device_release() in drivers/base/platform.c */
kfree(dev->platform_data);
kfree(pdev->resource);
+
+ if (!cs)
+ return;
+ dev_set_drvdata(dev, NULL);
+ kfree(cs->hw.ser);
+ cs->hw.ser = NULL;
}
/*
--
1.9.2.459.g68773ac
next prev parent reply other threads:[~2015-12-08 11:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-08 11:00 [PATCH 0/3] ser_gigaset fixes Tilman Schmidt
2015-12-08 11:00 ` Tilman Schmidt [this message]
2015-12-08 23:12 ` [PATCH 2/3] ser_gigaset: fix deallocation of platform device structure Paul Bolle
2015-12-09 11:10 ` Tilman Schmidt
2015-12-10 11:20 ` Paul Bolle
2015-12-10 14:04 ` Peter Hurley
2015-12-12 17:52 ` Tilman Schmidt
2015-12-08 11:00 ` [PATCH 3/3] ser_gigaset: remove unnecessary kfree() calls from release method Tilman Schmidt
2015-12-08 23:15 ` Paul Bolle
2015-12-08 11:00 ` [PATCH 1/3] ser_gigaset: fix up NULL checks Tilman Schmidt
2015-12-08 19:45 ` Paul Bolle
2015-12-08 22:16 ` One Thousand Gnomes
2015-12-09 10:45 ` Tilman Schmidt
2015-12-09 12:12 ` One Thousand Gnomes
2015-12-09 19:18 ` Paul Bolle
2015-12-10 11:31 ` [PATCH 0/3] ser_gigaset fixes Paul Bolle
2015-12-12 18:09 ` Tilman Schmidt
2015-12-12 18:32 ` Paul Bolle
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=83c4ab9bbca911aad62343154eabfa1af077b021.1449570042.git.tilman@imap.cc \
--to=tilman@imap.cc \
--cc=davem@davemloft.net \
--cc=gigaset307x-common@lists.sourceforge.net \
--cc=isdn4linux@listserv.isdn4linux.de \
--cc=isdn@linux-pingi.de \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pebolle@tiscali.nl \
--cc=peter@hurleysoftware.com \
--cc=sasha.levin@oracle.com \
--cc=syzkaller@googlegroups.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 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.