Jelajahi Sumber

staging: lustre: lustre: lov: lov_obd.c: Fix for possible null pointer dereference

There is otherwise a risk of a possible null pointer dereference.

Was largely found by using a static code analysis program called cppcheck.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rickard Strandqvist 11 tahun lalu
induk
melakukan
3456a40e8f
1 mengubah file dengan 5 tambahan dan 5 penghapusan
  1. 5 5
      drivers/staging/lustre/lustre/lov/lov_obd.c

+ 5 - 5
drivers/staging/lustre/lustre/lov/lov_obd.c

@@ -277,7 +277,7 @@ static int lov_disconnect_obd(struct obd_device *obd, struct lov_tgt_desc *tgt)
 
 
 	osc_obd = class_exp2obd(tgt->ltd_exp);
 	osc_obd = class_exp2obd(tgt->ltd_exp);
 	CDEBUG(D_CONFIG, "%s: disconnecting target %s\n",
 	CDEBUG(D_CONFIG, "%s: disconnecting target %s\n",
-	       obd->obd_name, osc_obd->obd_name);
+		obd->obd_name, osc_obd ? osc_obd->obd_name : "NULL");
 
 
 	if (tgt->ltd_active) {
 	if (tgt->ltd_active) {
 		tgt->ltd_active = 0;
 		tgt->ltd_active = 0;
@@ -285,11 +285,11 @@ static int lov_disconnect_obd(struct obd_device *obd, struct lov_tgt_desc *tgt)
 		tgt->ltd_exp->exp_obd->obd_inactive = 1;
 		tgt->ltd_exp->exp_obd->obd_inactive = 1;
 	}
 	}
 
 
-	lov_proc_dir = obd->obd_proc_private;
-	if (lov_proc_dir)
-		lprocfs_remove_proc_entry(osc_obd->obd_name, lov_proc_dir);
-
 	if (osc_obd) {
 	if (osc_obd) {
+		lov_proc_dir = obd->obd_proc_private;
+		if (lov_proc_dir) {
+			lprocfs_remove_proc_entry(osc_obd->obd_name, lov_proc_dir);
+		}
 		/* Pass it on to our clients.
 		/* Pass it on to our clients.
 		 * XXX This should be an argument to disconnect,
 		 * XXX This should be an argument to disconnect,
 		 * XXX not a back-door flag on the OBD.  Ah well.
 		 * XXX not a back-door flag on the OBD.  Ah well.