hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: lustre: ldlm: fix a use after free in ldlm_resource_get() 

If lvbo initialization has failed then save the return status (from
lr_lvb_len) before putting the resource.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5305
Reviewed-on: http://review.whamcloud.com/11017
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Emoly Liu <emoly.liu@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
John L. Hammond 2016-09-18 16:37:02 -04:00 committed by Greg Kroah-Hartman
parent 2e0ca34493
commit cde5f10973
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
View File

@ -1091,6 +1091,7 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent,
struct cfs_hash_bd bd;
__u64 version;
int ns_refcount = 0;
int rc;
LASSERT(!parent);
LASSERT(ns->ns_rs_hash);
@ -1140,8 +1141,9 @@ lvbo_init:
}
if (unlikely(res->lr_lvb_len < 0)) {
rc = res->lr_lvb_len;
ldlm_resource_putref(res);
res = ERR_PTR(res->lr_lvb_len);
res = ERR_PTR(rc);
}
return res;
}
@ -1152,8 +1154,6 @@ lvbo_init:
cfs_hash_bd_unlock(ns->ns_rs_hash, &bd, 1);
if (ns->ns_lvbo && ns->ns_lvbo->lvbo_init) {
int rc;
OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_CREATE_RESOURCE, 2);
rc = ns->ns_lvbo->lvbo_init(res);
if (rc < 0) {