projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e4fe2b
)
staging/lustre/lmv: fix potential null pointer dereference
author
Oleg Drokin
<
[email protected]
>
Mon, 14 Sep 2015 22:41:22 +0000
(18:41 -0400)
committer
Greg Kroah-Hartman
<
[email protected]
>
Tue, 15 Sep 2015 13:26:52 +0000
(06:26 -0700)
In lmv_disconnect_mdc do procfs removal only if we actually know the name.
Reviewed-on: http://review.whamcloud.com/14605
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6517
Reviewed-by: James Simmons <
[email protected]
>
Reviewed-by: John L. Hammond <
[email protected]
>
Reviewed-by: Dmitry Eremin <
[email protected]
>
Signed-off-by: Oleg Drokin <
[email protected]
>
Signed-off-by: Greg Kroah-Hartman <
[email protected]
>
drivers/staging/lustre/lustre/lmv/lmv_obd.c
patch
|
blob
|
history
diff --git
a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index 0fc0b61d9201e63ac27ca0fd90f40e600e679870..cebbacfc5bee357ffce1668433af22012da36192 100644
(file)
--- a/
drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/
drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@
-593,11
+593,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->lmv_tgts_kobj)
- sysfs_remove_link(lmv->lmv_tgts_kobj,
- mdc_obd->obd_name);
+ if (lmv->lmv_tgts_kobj)
+ sysfs_remove_link(lmv->lmv_tgts_kobj,
+ mdc_obd->obd_name);
+ }
rc = obd_fid_fini(tgt->ltd_exp->exp_obd);
if (rc)