From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6668C76186 for ; Mon, 29 Jul 2019 20:04:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D60820693 for ; Mon, 29 Jul 2019 20:04:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564430698; bh=Yf2qTam8zLu9PWEOf5/AZhz52ovvkQIAeWVI3Uu/gME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WUtq4zUF08NCqmBtVoj/5JgTWa/uaGqpF0IErnraMp9/wa4uExQks3uOk7/nGqwIB 9Nr1vyIGMft74DZn8spkSrthyXZQ2bacxKgU5d/vGRJxqCkLcnsDKremjDzmB/8OPz +bytfdIA/wMO9gU7XzgPOAMwcT6ERE8DJ+yBgfXY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389799AbfG2Tod (ORCPT ); Mon, 29 Jul 2019 15:44:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:33090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389793AbfG2Toa (ORCPT ); Mon, 29 Jul 2019 15:44:30 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 46BF02054F; Mon, 29 Jul 2019 19:44:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564429469; bh=Yf2qTam8zLu9PWEOf5/AZhz52ovvkQIAeWVI3Uu/gME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Alwqy12gEn08i29mm9hF+rNttZqIyD2ckWoyIYu0djNiN++G7c8InNPUI/lbxwjo1 TGs3iR/SQrtfQYIzMX2EJr8eEuZZXWnkpzX/Z+haiQ44i856NvMOu9F9BD95GsqNVl UGa1Klm4M1TUboeB6cGeYvMxBp+Wrd1ReFAqX4BI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ding Xiang , Takashi Iwai Subject: [PATCH 4.19 107/113] ALSA: ac97: Fix double free of ac97_codec_device Date: Mon, 29 Jul 2019 21:23:14 +0200 Message-Id: <20190729190720.814115267@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729190655.455345569@linuxfoundation.org> References: <20190729190655.455345569@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ding Xiang commit 607975b30db41aad6edc846ed567191aa6b7d893 upstream. put_device will call ac97_codec_release to free ac97_codec_device and other resources, so remove the kfree and other redundant code. Fixes: 74426fbff66e ("ALSA: ac97: add an ac97 bus") Signed-off-by: Ding Xiang Cc: Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/ac97/bus.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) --- a/sound/ac97/bus.c +++ b/sound/ac97/bus.c @@ -125,17 +125,12 @@ static int ac97_codec_add(struct ac97_co vendor_id); ret = device_add(&codec->dev); - if (ret) - goto err_free_codec; + if (ret) { + put_device(&codec->dev); + return ret; + } return 0; -err_free_codec: - of_node_put(codec->dev.of_node); - put_device(&codec->dev); - kfree(codec); - ac97_ctrl->codecs[idx] = NULL; - - return ret; } unsigned int snd_ac97_bus_scan_one(struct ac97_controller *adrv,