Commit 0e0eaf7e authored by Tilman Schmidt's avatar Tilman Schmidt Committed by Willy Tarreau

ser_gigaset: fix deallocation of platform device structure

commit 4c5e354a upstream.

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: default avatarTilman Schmidt <tilman@imap.cc>
Fixes: 2869b23e ("drivers/isdn/gigaset: new M101 driver (v2)")
Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
(cherry picked from commit 521e4101)
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent 1fe6e687
...@@ -381,20 +381,24 @@ static void gigaset_freecshw(struct cardstate *cs) ...@@ -381,20 +381,24 @@ static void gigaset_freecshw(struct cardstate *cs)
tasklet_kill(&cs->write_tasklet); tasklet_kill(&cs->write_tasklet);
if (!cs->hw.ser) if (!cs->hw.ser)
return; return;
dev_set_drvdata(&cs->hw.ser->dev.dev, NULL);
platform_device_unregister(&cs->hw.ser->dev); platform_device_unregister(&cs->hw.ser->dev);
kfree(cs->hw.ser);
cs->hw.ser = NULL;
} }
static void gigaset_device_release(struct device *dev) static void gigaset_device_release(struct device *dev)
{ {
struct platform_device *pdev = to_platform_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 */ /* adapted from platform_device_release() in drivers/base/platform.c */
//FIXME is this actually necessary? //FIXME is this actually necessary?
kfree(dev->platform_data); kfree(dev->platform_data);
kfree(pdev->resource); kfree(pdev->resource);
if (!cs)
return;
dev_set_drvdata(dev, NULL);
kfree(cs->hw.ser);
cs->hw.ser = NULL;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment