ocfs2: Fix a race in o2dlm lockres mastery(backport to 1.4)
PATCH 1/1 ocfs2: Fix a race in o2dlm lockres mastery(backport to 1.4)
In o2dlm, the master of a lock resource keeps a map of all interested nodes. This prevents the master from purging the resource before an interested node can create a lock.
A race between the mastery thread and the mastery handler allowed an interested node to discover who the master is without informing the master directly. This is easily fixed by holding the dlm spinlock a little longer in the mastery handler.
--- fs/ocfs2/dlm/dlmmaster.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
fs/ocfs2/dlm/dlmmaster.c +1 -3
@@ -1876,7 +1876,6 @@ int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data, ok:spin_unlock (&res->spinlock); } -spin_unlock (&dlm->spinlock);// mlog(0, "woo! got an assert_master from node %u!\n", // assert->node_idx);
@@ -1927,7 +1926,6 @@ ok:/* master is known, detach if not already detached. * ensures that only one assert_master call will happen * on this mle. */ -spin_lock (&dlm->spinlock);spin_lock (&dlm->master_lock); rr =atomic_read (&mle->mle_refs.refcount);
@@ -1960,7 +1958,6 @@ ok:__dlm_put_mle (mle); }spin_unlock (&dlm->master_lock); -spin_unlock (&dlm->spinlock); }else if (res) {if (res->owner != assert->node_idx) { mlog(0, "assert_master from %u, but current "
@@ -1968,6 +1965,7 @@ ok: res->owner, namelen, name); } } +spin_unlock (&dlm->spinlock); done: ret =0 ;
Signature · 1 line
1.5.6.5
PATCH 1/1 ocfs2: Fix a race in o2dlm lockres mastery(backport to 1.4)
Quoted 10 lines · Srinivas Eeda
In o2dlm, the master of a lock resource keeps a map of all interested nodes. This prevents the master from purging the resource before an interested node can create a lock.
A race between the mastery thread and the mastery handler allowed an interested node to discover who the master is without informing the master directly. This is easily fixed by holding the dlm spinlock a little longer in the mastery handler.
Signed-off-by Srinivas Eeda <[email protected]>
Has this patch changed at all since the one I took earlier?
Joel
Signature · 8 lines
"I don't even butter my bread; I consider that cooking."
- Katherine Cebrian
Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127