Skip to contentSkip to conversation

ocfs2: Avoid access invalid address when read o2dlm debug messages.

PATCH Superseded jiangyiwen 1 participant 1 message Sep 2, 2014 OCFS2

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

jiangyiwen

author
#0 lore raw

PATCH v2 1/1 ocfs2: Avoid access invalid address when read o2dlm debug messages.

The following case will lead to a lockres is freed but is still in use.

cat /sys/kernel/debug/o2dlm/locking_state dlm_thread
lockres_seq_start

    -> lock dlm->track_lock
    -> get resA
                                                resA->refs decrease to 0,
                                                call dlm_lockres_release,
                                                and wait for "cat" unlock.
Although resA->refs is already set to 0,
increase resA->refs, and then unlock
                                                lock dlm->track_lock
                                                    -> list_del_init()
                                                    -> unlock
                                                    -> free resA

In such a race case, invalid address access may occurs.
So we should delete list res->tracking before resA->refs decrease to 0.

---
 fs/ocfs2/dlm/dlmmaster.c | 10 ----------
 fs/ocfs2/dlm/dlmthread.c | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
fs/ocfs2/dlm/dlmmaster.c +0 -10
index 3ec906e..204f70d 100644
@@ -498,16 +498,6 @@ static void dlm_lockres_release(struct kref *kref)
 	mlog(0, "destroying lockres %.*s\n", res->lockname.len,
 	     res->lockname.name);
 
-	spin_lock(&dlm->track_lock);
-	if (!list_empty(&res->tracking))
-		list_del_init(&res->tracking);
-	else {
-		mlog(ML_ERROR, "Resource %.*s not on the Tracking list\n",
-		     res->lockname.len, res->lockname.name);
-		dlm_print_one_lock_resource(res);
-	}
-	spin_unlock(&dlm->track_lock);
-
 	atomic_dec(&dlm->res_cur_count);
 
 	if (!hlist_unhashed(&res->hash_node) ||
fs/ocfs2/dlm/dlmthread.c +10 -0
index 69aac6f..2e5e6d5 100644
@@ -211,6 +211,16 @@ static void dlm_purge_lockres(struct dlm_ctxt *dlm,
 
 	__dlm_unhash_lockres(dlm, res);
 
+	spin_lock(&dlm->track_lock);
+	if (!list_empty(&res->tracking))
+		list_del_init(&res->tracking);
+	else {
+		mlog(ML_ERROR, "Resource %.*s not on the Tracking list\n",
+				res->lockname.len, res->lockname.name);
+		__dlm_print_one_lock_resource(res);
+	}
+	spin_unlock(&dlm->track_lock);
+
 	/* lockres is not in the hash now.  drop the flag and wake up
 	 * any processes waiting in dlm_get_lock_resource. */
 	if (!master) {
Signature · 1 line
1.8.4.3