[069/190] Revert "mac80211: Remove redundant assertion"
diff mbox series

Message ID 20210421130105.1226686-70-gregkh@linuxfoundation.org
State New, archived
Headers show
Series
  • Revertion of all of the umn.edu commits
Related show

Commit Message

Greg KH April 21, 2021, 12:59 p.m. UTC
This reverts commit 1ee7826ab68f7e9fa1a01533983acf6a6f62e297.

Commits from @umn.edu addresses have been found to be submitted in "bad
faith" to try to test the kernel community's ability to review "known
malicious" changes.  The result of these submissions can be found in a
paper published at the 42nd IEEE Symposium on Security and Privacy
entitled, "Open Source Insecurity: Stealthily Introducing
Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University
of Minnesota) and Kangjie Lu (University of Minnesota).

Because of this, all submissions from this group must be reverted from
the kernel tree and will need to be re-reviewed again to determine if
they actually are a valid fix.  Until that work is complete, remove this
change to ensure that no problems are being introduced into the
codebase.

Cc: Aditya Pakki <pakki001@umn.edu>
Cc: https
Cc: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/mac80211/util.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Johannes Berg April 21, 2021, 1:39 p.m. UTC | #1
On Wed, 2021-04-21 at 12:59 +0000, Greg Kroah-Hartman wrote:
> This reverts commit 1ee7826ab68f7e9fa1a01533983acf6a6f62e297.
> 

That commit was actually correct, though sort of irrelevant. I think we
can go either way on it, but better not spend any (more) time on it.

johannes
Greg KH April 27, 2021, 2:09 p.m. UTC | #2
On Wed, Apr 21, 2021 at 03:39:47PM +0200, Johannes Berg wrote:
> On Wed, 2021-04-21 at 12:59 +0000, Greg Kroah-Hartman wrote:
> > This reverts commit 1ee7826ab68f7e9fa1a01533983acf6a6f62e297.
> > 
> 
> That commit was actually correct, though sort of irrelevant. I think we
> can go either way on it, but better not spend any (more) time on it.

I'll drop it, thanks!

greg k-h

Patch
diff mbox series

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index c0fa526a45b4..2de2e655be59 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -39,6 +39,7 @@  const void *const mac80211_wiphy_privid = &mac80211_wiphy_privid;
 struct ieee80211_hw *wiphy_to_ieee80211_hw(struct wiphy *wiphy)
 {
 	struct ieee80211_local *local;
+	BUG_ON(!wiphy);
 
 	local = wiphy_priv(wiphy);
 	return &local->hw;