From patchwork Tue Dec 8 11:00:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tilman Schmidt X-Patchwork-Id: 553866 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1B8201402DE for ; Tue, 8 Dec 2015 22:14:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964986AbbLHLOf (ORCPT ); Tue, 8 Dec 2015 06:14:35 -0500 Received: from gimli.pxnet.com ([89.1.7.7]:55561 "EHLO mail.pxnet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932414AbbLHLOd (ORCPT ); Tue, 8 Dec 2015 06:14:33 -0500 Received: from xenon.ts.pxnet.com (p20030070CF7EEC000219D1FFFE03D8FF.dip0.t-ipconnect.de [IPv6:2003:70:cf7e:ec00:219:d1ff:fe03:d8ff]) (user=ts author=<> mech=DIGEST-MD5 bits=0) by mail.pxnet.com (8.13.8/8.13.8) with ESMTP id tB8B0YJ1010016 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 8 Dec 2015 12:00:38 +0100 Received: by xenon.ts.pxnet.com (Postfix, from userid 1000) id E361114008E; Tue, 8 Dec 2015 12:00:33 +0100 (CET) Message-Id: <83c4ab9bbca911aad62343154eabfa1af077b021.1449570042.git.tilman@imap.cc> In-Reply-To: References: From: Tilman Schmidt Subject: [PATCH 2/3] ser_gigaset: fix deallocation of platform device structure To: Paul Bolle , netdev@vger.kernel.org Cc: Peter Hurley , Sasha Levin , , David Miller , Karsten Keil , isdn4linux@listserv.isdn4linux.de, , Date: Tue, 8 Dec 2015 12:00:33 +0100 (CET) X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (mail.pxnet.com [IPv6:2001:4dd0:f004:7::7]); Tue, 08 Dec 2015 12:00:46 +0100 (CET) X-Scanned-By: MIMEDefang 2.70 on IPv6:2001:4dd0:f004:7::7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Fixes: 2869b23e4b95 ("drivers/isdn/gigaset: new M101 driver (v2)") Reported-by: Sasha Levin --- 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; } /*