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

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

staging: lustre: obd: validate open handle cookies 



Add a const void *h_owner member to struct portals_handle. Add a const
void *owner parameter to class_handle2object() which must be matched
by the h_owner member of the handle in addition to the cookie.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3233
Reviewed-on: http://review.whamcloud.com/6938


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarFan Yong <fan.yong@intel.com>
Reviewed-by: default avatarMike Pershin <mike.pershin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6a42e615

drivers/staging/lustre/lustre/include/lustre_handles.h

+2 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ struct portals_handle_ops { 
struct portals_handle {

	struct list_head			h_link;

	__u64				h_cookie;

	const void			*h_owner;

	struct portals_handle_ops	*h_ops;



	/* newly added fields to handle the RCU issue. -jxiong */
@@ -83,7 +84,7 @@ struct portals_handle { 
void class_handle_hash(struct portals_handle *,

		       struct portals_handle_ops *ops);

void class_handle_unhash(struct portals_handle *);

void *class_handle2object(__u64 cookie);

void *class_handle2object(__u64 cookie, const void *owner);

void class_handle_free_cb(struct rcu_head *rcu);

int class_handle_init(void);

void class_handle_cleanup(void);

drivers/staging/lustre/lustre/ldlm/ldlm_lock.c

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *handle, 


	LASSERT(handle);



	lock = class_handle2object(handle->cookie);

	lock = class_handle2object(handle->cookie, NULL);

	if (!lock)

		return NULL;

drivers/staging/lustre/lustre/obdclass/genops.c

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ struct obd_export *class_conn2export(struct lustre_handle *conn) 
	}



	CDEBUG(D_INFO, "looking for export cookie %#llx\n", conn->cookie);

	export = class_handle2object(conn->cookie);

	export = class_handle2object(conn->cookie, NULL);

	return export;

}

EXPORT_SYMBOL(class_conn2export);

drivers/staging/lustre/lustre/obdclass/lustre_handles.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ void class_handle_unhash(struct portals_handle *h) 
}

EXPORT_SYMBOL(class_handle_unhash);



void *class_handle2object(__u64 cookie)

void *class_handle2object(__u64 cookie, const void *owner)

{

	struct handle_bucket *bucket;

	struct portals_handle *h;
@@ -145,7 +145,7 @@ void *class_handle2object(__u64 cookie) 


	rcu_read_lock();

	list_for_each_entry_rcu(h, &bucket->head, h_link) {

		if (h->h_cookie != cookie)

		if (h->h_cookie != cookie || h->h_owner != owner)

			continue;



		spin_lock(&h->h_lock);