Commit d165e4ef authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: rtw_wdev_alloc(): Don't register wiphy before kmalloc() completed 



There is no point starting to register the wiphy and then having to
unregister it again if the followon kmalloc() fails.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56b0bd91

drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c

+12 −10
Original line number Diff line number Diff line
@@ -3367,22 +3367,24 @@ int rtw_wdev_alloc(struct rtw_adapter *padapter, struct device *dev) 
		ret = -ENOMEM;

		goto exit;

	}



	/*  wdev */

	wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);

	if (!wdev) {

		DBG_8723A("Couldn't allocate wireless device\n");

		ret = -ENOMEM;

		goto free_wiphy;

	}



	set_wiphy_dev(wiphy, dev);

	rtw_cfg80211_preinit_wiphy(padapter, wiphy);



	ret = wiphy_register(wiphy);

	if (ret < 0) {

		DBG_8723A("Couldn't register wiphy device\n");

		goto free_wiphy;

		goto free_wdev;

	}



	/*  wdev */

	wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);

	if (!wdev) {

		DBG_8723A("Couldn't allocate wireless device\n");

		ret = -ENOMEM;

		goto unregister_wiphy;

	}

	wdev->wiphy = wiphy;

	wdev->netdev = pnetdev;

	/* wdev->iftype = NL80211_IFTYPE_STATION; */
@@ -3408,8 +3410,8 @@ int rtw_wdev_alloc(struct rtw_adapter *padapter, struct device *dev) 
		pwdev_priv->power_mgmt = false;



	return ret;

unregister_wiphy:

	wiphy_unregister(wiphy);

free_wdev:

	kfree(wdev);

free_wiphy:

	wiphy_free(wiphy);

exit:

CRA Git | Maintained and supported by SUSTech CRA and CCSE