[070/190] Revert "rfkill: Fix incorrect check to avoid NULL pointer dereference"
diff mbox series

Message ID 20210421130105.1226686-71-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 6fc232db9e8cd50b9b83534de9cd91ace711b2d7.

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/rfkill/core.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Comments

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

This commit was fine, though the commit log is misleading since there's
no dereference yet, just a pointer calculation. I may not have seen that
at the time, or have decided that the slight commit log inaccuracy
didn't matter.

I'm inclined towards keeping it, since it removed a BUG_ON(), but
there's no reasonable scenario where somebody could end up calling this
function with a NULL pointer.

johannes
Greg KH April 21, 2021, 1:53 p.m. UTC | #2
On Wed, Apr 21, 2021 at 03:43:31PM +0200, Johannes Berg wrote:
> On Wed, 2021-04-21 at 12:59 +0000, Greg Kroah-Hartman wrote:
> > This reverts commit 6fc232db9e8cd50b9b83534de9cd91ace711b2d7.
> 
> This commit was fine, though the commit log is misleading since there's
> no dereference yet, just a pointer calculation. I may not have seen that
> at the time, or have decided that the slight commit log inaccuracy
> didn't matter.
> 
> I'm inclined towards keeping it, since it removed a BUG_ON(), but
> there's no reasonable scenario where somebody could end up calling this
> function with a NULL pointer.

Yeah, these "pointless" patches are not good as they waste maintainers
bandwidth, which is why I want to discourage them.

thanks for reviewing these reverts, much apprecated.

greg k-h
Greg KH April 26, 2021, 5:11 p.m. UTC | #3
On Wed, Apr 21, 2021 at 03:43:31PM +0200, Johannes Berg wrote:
> On Wed, 2021-04-21 at 12:59 +0000, Greg Kroah-Hartman wrote:
> > This reverts commit 6fc232db9e8cd50b9b83534de9cd91ace711b2d7.
> 
> This commit was fine, though the commit log is misleading since there's
> no dereference yet, just a pointer calculation. I may not have seen that
> at the time, or have decided that the slight commit log inaccuracy
> didn't matter.
> 
> I'm inclined towards keeping it, since it removed a BUG_ON(), but
> there's no reasonable scenario where somebody could end up calling this
> function with a NULL pointer.

I've dropped this revert from my tree now, thanks.

greg k-h

Patch
diff mbox series

diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index ac15a944573f..8a27164d7f5f 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -1033,13 +1033,10 @@  static void rfkill_sync_work(struct work_struct *work)
 int __must_check rfkill_register(struct rfkill *rfkill)
 {
 	static unsigned long rfkill_no;
-	struct device *dev;
+	struct device *dev = &rfkill->dev;
 	int error;
 
-	if (!rfkill)
-		return -EINVAL;
-
-	dev = &rfkill->dev;
+	BUG_ON(!rfkill);
 
 	mutex_lock(&rfkill_global_mutex);