From 47c49d3cbb21c94c03831bb4d524d53772a1c2f9 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Mon, 18 May 2015 11:31:33 -0400 Subject: [PATCH 1/1] LU-6517 lmv: fix potential null pointer dereference In lmv_disconnect_mdc do procfs removal only if we actually know the name. Change-Id: Icb658a8a2007eea254ea5ce70b95c5d73df89914 Signed-off-by: Oleg Drokin Reviewed-on: http://review.whamcloud.com/14605 Reviewed-by: James Simmons Reviewed-by: John L. Hammond Tested-by: Jenkins Reviewed-by: Dmitry Eremin Tested-by: Maloo --- lustre/lmv/lmv_obd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c index 5fe258e..5f16b32 100644 --- a/lustre/lmv/lmv_obd.c +++ b/lustre/lmv/lmv_obd.c @@ -610,11 +610,11 @@ static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt) mdc_obd->obd_force = obd->obd_force; mdc_obd->obd_fail = obd->obd_fail; mdc_obd->obd_no_recov = obd->obd_no_recov; - } - if (lmv->targets_proc_entry != NULL) - lprocfs_remove_proc_entry(mdc_obd->obd_name, - lmv->targets_proc_entry); + if (lmv->targets_proc_entry != NULL) + lprocfs_remove_proc_entry(mdc_obd->obd_name, + lmv->targets_proc_entry); + } rc = obd_fid_fini(tgt->ltd_exp->exp_obd); if (rc) -- 1.8.3.1