Skip to contentSkip to conversation

staging:gpib: Fix a dereference before null check issue

PATCH In review Paolo Perego 2 participants 2 messages Nov 21, 2024 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging:gpib: Fix a dereference before null check issue

This commit fixes a dereference before null check issue discovered by Coverity (CID 1601566).

The check at line 1450 suggests that a_priv can be NULL, however it has been dereferenced before, in the interface_to_usbdev() call.

After a discussion, the NULL check is useless because private data is allocated in attach routine and freed in detach routine, so in detach routine the pointer has to be not NULL for sure.

Fixes Removes a useless NULL check

---
v2:
* After a discussion, we agreed the NULL check is useless because private data is freed in detach routine and allocated while attaching. For such a reason, the pointer has to be not NULL while detaching the device

 .../gpib/agilent_82357a/agilent_82357a.c      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/staging/gpib/agilent_82357a/agilent_82357a.c +10 -10
index bf05fb4a736b..e940429dea19 100644
@@ -1447,17 +1447,17 @@ static void agilent_82357a_detach(gpib_board_t *board)
 
 	a_priv = board->private_data;
 	usb_dev = interface_to_usbdev(a_priv->bus_interface);
-	if (a_priv) {
-		if (a_priv->bus_interface) {
-			agilent_82357a_go_idle(board);
-			usb_set_intfdata(a_priv->bus_interface, NULL);
-		}
-		mutex_lock(&a_priv->control_alloc_lock);
-		mutex_lock(&a_priv->bulk_alloc_lock);
-		mutex_lock(&a_priv->interrupt_alloc_lock);
-		agilent_82357a_cleanup_urbs(a_priv);
-		agilent_82357a_free_private(a_priv);
+
+	if (a_priv->bus_interface) {
+		agilent_82357a_go_idle(board);
+		usb_set_intfdata(a_priv->bus_interface, NULL);
 	}
+	
+	mutex_lock(&a_priv->control_alloc_lock);
+	mutex_lock(&a_priv->bulk_alloc_lock);
+	mutex_lock(&a_priv->interrupt_alloc_lock);
+	agilent_82357a_cleanup_urbs(a_priv);
+	agilent_82357a_free_private(a_priv);
 	dev_info(&usb_dev->dev, "%s: detached\n", __func__);
 	mutex_unlock(&agilent_82357a_hotplug_lock);
 }
Signature · 1 line
2.47.0
#1 lore raw
Quoted 6 lines · Paolo Perego

This commit fixes a dereference before null check issue discovered by Coverity (CID 1601566).

The check at line 1450 suggests that a_priv can be NULL, however it has been dereferenced before, in the interface_to_usbdev() call.

Quoted 6 lines

After a discussion, the NULL check is useless because private data is allocated in attach routine and freed in detach routine, so in detach routine the pointer has to be not NULL for sure.

Fixes Removes a useless NULL check

This isn't how the Fixes tag works. It's supposed to refer to the patch which introduces the static checker warning.

Fixes fbae7090f30c ("staging: gpib: Update messaging and usb_device refs in agilent_usb")

The patch has a couple checkpatch issues as well. Please, fix those up and resend.

regards,
dan carpenter