Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cde5f109 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

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: default avatarJohn 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: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarEmoly Liu <emoly.liu@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e0ca344

drivers/staging/lustre/lustre/ldlm/ldlm_resource.c

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent, 
		}



		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 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent, 


	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) {