| Message ID | 20211115092139.24407-1-liuguoqiang@uniontech.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | cfg80211: delete redundant free code | expand |
On Mon, 2021-11-15 at 17:21 +0800, liuguoqiang wrote: > When kzalloc failed and rdev->sacn_req or rdev->scan_msg is null, pass a > null pointer to kfree is redundant, delete it and return directly. > Arguably then we should not set creq=NULL at the beginning? johannes
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 22e92be61938..011fcfabc846 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -2702,10 +2702,8 @@ int cfg80211_wext_siwscan(struct net_device *dev, if (IS_ERR(rdev)) return PTR_ERR(rdev); - if (rdev->scan_req || rdev->scan_msg) { - err = -EBUSY; - goto out; - } + if (rdev->scan_req || rdev->scan_msg) + return -EBUSY; wiphy = &rdev->wiphy; @@ -2718,10 +2716,8 @@ int cfg80211_wext_siwscan(struct net_device *dev, creq = kzalloc(sizeof(*creq) + sizeof(struct cfg80211_ssid) + n_channels * sizeof(void *), GFP_ATOMIC); - if (!creq) { - err = -ENOMEM; - goto out; - } + if (!creq) + return -ENOMEM; creq->wiphy = wiphy; creq->wdev = dev->ieee80211_ptr;
When kzalloc failed and rdev->sacn_req or rdev->scan_msg is null, pass a null pointer to kfree is redundant, delete it and return directly. Signed-off-by: liuguoqiang <liuguoqiang@uniontech.com> --- net/wireless/scan.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)