RE: [patch] rapidio: potential null deref on failure path

[Bounine, Alexandre]

Better to combine both conditions:

if (rio_is_switch(rdev) && rswitch->route_table))
 		kfree(rswitch->route_table);

Because there is situation when routine fails to allocate route_table
for a switch.

Alex. 


-----Original Message-----
From: Dan Carpenter [mailto:error27@xxxxxxxxx] 
Sent: Saturday, March 19, 2011 12:41 AM
To: Matt Porter
Cc: Bounine, Alexandre; linux-kernel@xxxxxxxxxxxxxxx;
kernel-janitors@xxxxxxxxxxxxxxx
Subject: [patch] rapidio: potential null deref on failure path

If rio is not a switch then "rswitch" is null.

Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>

diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index a50391b..3a59d5f 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -517,7 +517,7 @@ static struct rio_dev __devinit
*rio_setup_device(struct rio_net *net,
 	return rdev;
 
 cleanup:
-	if (rswitch->route_table)
+	if (rio_is_switch(rdev))
 		kfree(rswitch->route_table);
 
 	kfree(rdev);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/