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>

diff --git a/drivers/staging/lustre/lustre/lov/lov_obd.c b/drivers/staging/lustre/lustre/lov/lov_obd.c
index 12e778c422557473e31b609589c0f613b1ce35e4..2d843b1c1dedbe9048524f3fcf74c0594ed3b048 100644 (file)
--- a/drivers/staging/lustre/lustre/lov/lov_obd.c
+++ b/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);
        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) {
                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;
        }
 
-       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) {
+               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.
                 * XXX This should be an argument to disconnect,
                 * XXX not a back-door flag on the OBD.  Ah well.