Received: by 2002:aa6:c429:0:b029:98:93ff:f56f with SMTP id g9csp3386785lkq; Mon, 23 Nov 2020 04:31:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfcy7F7yfSycicnYH0Tn/O6zq6XpW4FutmcQb7w8NSQBPmPOE77vWDRBUQmsydF9d2ks2j X-Received: by 2002:a17:906:c51:: with SMTP id t17mr46635416ejf.523.1606134691089; Mon, 23 Nov 2020 04:31:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606134691; cv=none; d=google.com; s=arc-20160816; b=JO1VOfzCYxjU+rv1+fWsFBLEyEIRLFXGZGQmQHaPgpm603tyfR36OqSMTYXeCRcwip R9zp1z/oCepG8EsRW0mknfqjTrshqoUao53lGDlYOhZ0vP6efDCxRGO8l7XDJkiGtYCH uueWhSEiU4TdVNNlmiWNm6mg4UB5GStJuU9F/KCdgeQfTcD9QCH/jQSPs0ScIcBiG7e+ jns8R3FowEzegcC2VfqbiK3KMpoUZNkdQ/ly9nYVaVlGwM5J4/h9QgIAXtXpaoMn/CkS MtBKuv0F5bOzn6ar4N/hjize8G2HKxkyUOVf4+HYsOPkKUzNm6h2kY3/oOB+TO28JA1s ZFkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZSmixu053GaXCY5ZCFhCcCOyZOaqYAg00BVXj6l94tM=; b=uTjlFFblPRK6k/AA0/NfG2bQSIHy1aEnU2K4TprFfhmlJ+csPP+oTExlYpwLt8rYam sRudNoI03I0VxoiNglwlRIvOAACMqJDjh8F8CNZR2Gv9tMevrpRmkO/x/hpnst0V+CKI 5r6F81l9gHZokn7rx/k5VVNq+RFVs4oY/9cJcFtWllVvO0NFndS7tvXRtrlNjz/rG6Bu tOaNrIHrWmG4aCHtuGh6e3QaxSUo1UCqvxOfzllhoLGj8xyQI7CQMqlQ9JBbkvWA/Tjh 8LJL79ZDpjsNkMZVGUs3qfcije4pP8DGC+aOSml/uvMcD3+PLfrgHfuOBLY+XyK/4baY yQMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="qq/32oXV"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q22si6420348ejy.29.2020.11.23.04.31.08; Mon, 23 Nov 2020 04:31:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="qq/32oXV"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730131AbgKWM0R (ORCPT + 99 others); Mon, 23 Nov 2020 07:26:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:36006 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730118AbgKWM0O (ORCPT ); Mon, 23 Nov 2020 07:26:14 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 2C1D520728; Mon, 23 Nov 2020 12:26:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1606134373; bh=T+K1zlRew3ryGsi62w+reYxMmI8B1UZy564mOS2Y14k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qq/32oXViiGDIFgrIKGk/nmp2kphBJNENcghikeuwbZdtmBsmbjXUZxzY9vFRULWd pTP++08GKxLiqk5Fh2N64CuB4YTrleq7ZC6JrdYmR/kbLJHWxp0mHCTN+X9O9gaJ1M l1aPut2jbsJUXX/AVX8BbyupDqNfttrH9xqDs7qo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+32c6c38c4812d22f2f0b@syzkaller.appspotmail.com, syzbot+4c81fe92e372d26c4246@syzkaller.appspotmail.com, syzbot+6a7fe9faf0d1d61bc24a@syzkaller.appspotmail.com, syzbot+abed06851c5ffe010921@syzkaller.appspotmail.com, syzbot+b7aeb9318541a1c709f1@syzkaller.appspotmail.com, syzbot+d5a9416c6cafe53b5dd0@syzkaller.appspotmail.com, Johannes Berg Subject: [PATCH 4.9 45/47] mac80211: free sta in sta_info_insert_finish() on errors Date: Mon, 23 Nov 2020 13:22:31 +0100 Message-Id: <20201123121807.728010760@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201123121805.530891002@linuxfoundation.org> References: <20201123121805.530891002@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg commit 7bc40aedf24d31d8bea80e1161e996ef4299fb10 upstream. If sta_info_insert_finish() fails, we currently keep the station around and free it only in the caller, but there's only one such caller and it always frees it immediately. As syzbot found, another consequence of this split is that we can put things that sleep only into __cleanup_single_sta() and not in sta_info_free(), but this is the only place that requires such of sta_info_free() now. Change this to free the station in sta_info_insert_finish(), in which case we can still sleep. This will also let us unify the cleanup code later. Cc: stable@vger.kernel.org Fixes: dcd479e10a05 ("mac80211: always wind down STA state") Reported-by: syzbot+32c6c38c4812d22f2f0b@syzkaller.appspotmail.com Reported-by: syzbot+4c81fe92e372d26c4246@syzkaller.appspotmail.com Reported-by: syzbot+6a7fe9faf0d1d61bc24a@syzkaller.appspotmail.com Reported-by: syzbot+abed06851c5ffe010921@syzkaller.appspotmail.com Reported-by: syzbot+b7aeb9318541a1c709f1@syzkaller.appspotmail.com Reported-by: syzbot+d5a9416c6cafe53b5dd0@syzkaller.appspotmail.com Link: https://lore.kernel.org/r/20201112112201.ee6b397b9453.I9c31d667a0ea2151441cc64ed6613d36c18a48e0@changeid Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/sta_info.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -601,7 +601,7 @@ static int sta_info_insert_finish(struct out_drop_sta: local->num_sta--; synchronize_net(); - __cleanup_single_sta(sta); + cleanup_single_sta(sta); out_err: mutex_unlock(&local->sta_mtx); kfree(sinfo); @@ -620,19 +620,13 @@ int sta_info_insert_rcu(struct sta_info err = sta_info_insert_check(sta); if (err) { + sta_info_free(local, sta); mutex_unlock(&local->sta_mtx); rcu_read_lock(); - goto out_free; + return err; } - err = sta_info_insert_finish(sta); - if (err) - goto out_free; - - return 0; - out_free: - sta_info_free(local, sta); - return err; + return sta_info_insert_finish(sta); } int sta_info_insert(struct sta_info *sta)