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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,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 40AA4CA9EB9 for ; Sat, 26 Oct 2019 13:25:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B3F82070B for ; Sat, 26 Oct 2019 13:25:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572096357; bh=Vt7CJhpB0LiswZHCEHqxV9uDX/kHekbB8hF5SvXRc8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iKYiUwzCsKhgAbpurEkDQDqubhoUzDhPzHQufpL726omKMw7VGrXkzDhmViAClvYM QWtHSSNs431kGz7AkxU8rKuJJUtYm7qxuvPkTqIFHXawYpO8YGDd2Drv7CcT6zxxBG 8/kqROV7B/jGHv8byGiAAQmsJ7gc8ElNVHYXYN7Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729004AbfJZNZr (ORCPT ); Sat, 26 Oct 2019 09:25:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:44124 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728187AbfJZNWV (ORCPT ); Sat, 26 Oct 2019 09:22:21 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DFD8D222D1; Sat, 26 Oct 2019 13:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572096140; bh=Vt7CJhpB0LiswZHCEHqxV9uDX/kHekbB8hF5SvXRc8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pru1u12E1Gtx7A2BBWrKHt0E1oRUqyNDjIfjIaoNvhFhGy2vXHw8YXuB0P4pisiCg Ag4bhYGVXhMv8/hqF2AlKkpAgOHpCq0pFAi9ZU/IHGGbw/KUum6NoOIZ6l/7KmFtvI 5dfZ5NxFxdrpnXk3arXlpZCjMniIlksJHGVeZENw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michael Vassernis , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 02/21] mac80211_hwsim: fix incorrect dev_alloc_name failure goto Date: Sat, 26 Oct 2019 09:21:58 -0400 Message-Id: <20191026132217.4380-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191026132217.4380-1-sashal@kernel.org> References: <20191026132217.4380-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Michael Vassernis [ Upstream commit 313c3fe9c2348e7147eca38bb446f295b45403a0 ] If dev_alloc_name fails, hwsim_mon's memory allocated in alloc_netdev needs to be freed. Change goto command in dev_alloc_name failure to out_free_mon in order to perform free_netdev. Signed-off-by: Michael Vassernis Link: https://lore.kernel.org/r/20191003073049.3760-1-michael.vassernis@tandemg.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/mac80211_hwsim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index e9ec1da9935d8..0651a323b64f1 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -3502,7 +3502,7 @@ static int __init init_mac80211_hwsim(void) err = dev_alloc_name(hwsim_mon, hwsim_mon->name); if (err < 0) { rtnl_unlock(); - goto out_free_radios; + goto out_free_mon; } err = register_netdevice(hwsim_mon); -- 2.20.1