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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 93891C2D0CE for ; Sun, 29 Dec 2019 17:22:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6BB6A222C2 for ; Sun, 29 Dec 2019 17:22:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640123; bh=jSgXTUbGKEhoaI+KZTgVjhJDZbKnXndVWh9dIPJY+5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TifCoq6+t7ZoeR7pm9WJCa1/LRSo4ueBSIW2V26z7qgHpQEoJ5eLGTpEuEkBhQmJE hTG2EB4qe3QErEA6Kmw5ga/lgPPqvnNg7i0qZ9PCP+OGgtYvXpL4kOJZKrTfC4LvMV OZZHVt9lKyjfB/zsZs6raDIjOH98D5sbdTrz2dL4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727145AbfL2RWC (ORCPT ); Sun, 29 Dec 2019 12:22:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:37888 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727159AbfL2RWA (ORCPT ); Sun, 29 Dec 2019 12:22:00 -0500 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 7F41120CC7; Sun, 29 Dec 2019 17:21:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640120; bh=jSgXTUbGKEhoaI+KZTgVjhJDZbKnXndVWh9dIPJY+5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ENfsImsl6ahQsmqYJPHKpbUGrDlPWaGUI6h3pqGBUWrfMrOtTozayn1RJ+c9C1+7j 1LDtfPtQ4TGbcH/s+S02HpRQOZM5Gjjfi0hAmswTtN8HSyegtf1m/D5zQZ0pis5Ivk 1ZRBoxyxsKvShntEcF8kI8gR7zeJoD/CWpAZZ9NI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Navid Emamdoost , Kalle Valo , Sasha Levin Subject: [PATCH 4.14 026/161] rtlwifi: prevent memory leak in rtl_usb_probe Date: Sun, 29 Dec 2019 18:17:54 +0100 Message-Id: <20191229162405.898862695@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162355.500086350@linuxfoundation.org> References: <20191229162355.500086350@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: Navid Emamdoost [ Upstream commit 3f93616951138a598d930dcaec40f2bfd9ce43bb ] In rtl_usb_probe if allocation for usb_data fails the allocated hw should be released. In addition the allocated rtlpriv->usb_data should be released on error handling path. Signed-off-by: Navid Emamdoost Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtlwifi/usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c index 2401c8bdb211..93eda23f0123 100644 --- a/drivers/net/wireless/realtek/rtlwifi/usb.c +++ b/drivers/net/wireless/realtek/rtlwifi/usb.c @@ -1068,8 +1068,10 @@ int rtl_usb_probe(struct usb_interface *intf, rtlpriv->hw = hw; rtlpriv->usb_data = kzalloc(RTL_USB_MAX_RX_COUNT * sizeof(u32), GFP_KERNEL); - if (!rtlpriv->usb_data) + if (!rtlpriv->usb_data) { + ieee80211_free_hw(hw); return -ENOMEM; + } /* this spin lock must be initialized early */ spin_lock_init(&rtlpriv->locks.usb_lock); @@ -1130,6 +1132,7 @@ error_out2: _rtl_usb_io_handler_release(hw); usb_put_dev(udev); complete(&rtlpriv->firmware_loading_complete); + kfree(rtlpriv->usb_data); return -ENODEV; } EXPORT_SYMBOL(rtl_usb_probe); -- 2.20.1