Skip to contentSkip to conversation

usb: misc: chaoskey: remove useless else

PATCH In review Salah Triki 3 participants 3 messages Aug 13, 2021 – Aug 14, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: misc: chaoskey: remove useless else

Remove useless else in order to make the code cleaner.

---
 drivers/usb/misc/chaoskey.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/usb/misc/chaoskey.c +4 -7
index 87067c3d6109..9814ac2201d5 100644
@@ -299,14 +299,11 @@ static int chaoskey_release(struct inode *inode, struct file *file)
 
 	--dev->open;
 
-	if (!dev->present) {
-		if (dev->open == 0) {
-			mutex_unlock(&dev->lock);
+	mutex_unlock(&dev->lock);
+
+	if (!dev->present)
+		if (dev->open == 0)
 			chaoskey_free(dev);
-		} else
-			mutex_unlock(&dev->lock);
-	} else
-		mutex_unlock(&dev->lock);
 
 	usb_dbg(interface, "release success");
 	return 0;
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 4 lines · Salah Triki

Remove useless else in order to make the code cleaner.

drivers/usb/misc/chaoskey.c +0 -2
-	if (!dev->present) {
-		if (dev->open == 0) {

drivers/usb/misc/chaoskey.c static int chaoskey_release(struct inode *inode, struct file *file) · line 309

Quoted 10 lines
drivers/usb/misc/chaoskey.c +4 -5
-			mutex_unlock(&dev->lock);
+	mutex_unlock(&dev->lock);
+
+	if (!dev->present)
+		if (dev->open == 0)
 			chaoskey_free(dev);
-		} else
-			mutex_unlock(&dev->lock);
-	} else
-		mutex_unlock(&dev->lock);

This accesses dev->present outside of the lock region introducing a potential race condition.

Signature · 1 line
-keith
#2 lore raw
In reply to Salah Triki
Quoted 33 lines · Salah Triki

Remove useless else in order to make the code cleaner.

---
 drivers/usb/misc/chaoskey.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/usb/misc/chaoskey.c +4 -7
index 87067c3d6109..9814ac2201d5 100644
@@ -299,14 +299,11 @@ static int chaoskey_release(struct inode *inode, struct file *file)
 
 	--dev->open;
 
-	if (!dev->present) {
-		if (dev->open == 0) {
-			mutex_unlock(&dev->lock);
+	mutex_unlock(&dev->lock);
+
+	if (!dev->present)
+		if (dev->open == 0)
 			chaoskey_free(dev);
-		} else
-			mutex_unlock(&dev->lock);
-	} else
-		mutex_unlock(&dev->lock);
 
 	usb_dbg(interface, "release success");
 	return 0;
Signature · 1 line
2.25.1

Please fix whatever tool "found" this code to be changed so that it does not introduce bugs again, that's a broken tool.

thanks,

greg k-h