From: Ashish Samant <ashish.samant@oracle.com>
To: ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH] ocfs2: Fix locking for res->tracking and dlm->tracking_list
Date: Thu, 21 Jun 2018 16:57:09 -0700 [thread overview]
Message-ID: <1529625429-13901-1-git-send-email-ashish.samant@oracle.com> (raw)
In dlm_init_lockres() and dlm_unregister_domain() we access and modify
res->tracking and dlm->tracking_list without holding dlm->track_lock.
This can cause list corruptions and can end up in kernel panic.
Fix this by locking res->tracking and dlm->tracking_list with
dlm->track_lock at all places.
Signed-off-by: Ashish Samant <ashish.samant@oracle.com>
---
fs/ocfs2/dlm/dlmdomain.c | 2 ++
fs/ocfs2/dlm/dlmmaster.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 2acd58b..cfb1edd 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -723,6 +723,7 @@ void dlm_unregister_domain(struct dlm_ctxt *dlm)
mlog(0, "%s: more migration to do\n", dlm->name);
}
+ spin_lock(&dlm->track_lock);
/* This list should be empty. If not, print remaining lockres */
if (!list_empty(&dlm->tracking_list)) {
mlog(ML_ERROR, "Following lockres' are still on the "
@@ -730,6 +731,7 @@ void dlm_unregister_domain(struct dlm_ctxt *dlm)
list_for_each_entry(res, &dlm->tracking_list, tracking)
dlm_print_one_lock_resource(res);
}
+ spin_unlock(&dlm->track_lock);
dlm_mark_domain_leaving(dlm);
dlm_leave_domain(dlm);
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index aaca094..826f056 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -584,9 +584,9 @@ static void dlm_init_lockres(struct dlm_ctxt *dlm,
res->last_used = 0;
- spin_lock(&dlm->spinlock);
+ spin_lock(&dlm->track_lock);
list_add_tail(&res->tracking, &dlm->tracking_list);
- spin_unlock(&dlm->spinlock);
+ spin_unlock(&dlm->track_lock);
memset(res->lvb, 0, DLM_LVB_LEN);
memset(res->refmap, 0, sizeof(res->refmap));
--
1.9.1
next reply other threads:[~2018-06-21 23:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-21 23:57 Ashish Samant [this message]
2018-06-22 0:34 ` [Ocfs2-devel] [PATCH] ocfs2: Fix locking for res->tracking and dlm->tracking_list piaojun
2018-06-22 1:33 ` Changwei Ge
2018-06-22 8:32 ` Joseph Qi
2018-06-22 8:50 ` Changwei Ge
2018-06-22 8:55 ` Joseph Qi
2018-06-22 9:25 ` Changwei Ge
2018-06-22 9:41 ` Joseph Qi
2018-06-22 23:33 ` Ashish Samant
2018-06-25 1:07 ` Changwei Ge
2018-06-25 18:28 ` Ashish Samant
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1529625429-13901-1-git-send-email-ashish.samant@oracle.com \
--to=ashish.samant@oracle.com \
--cc=ocfs2-devel@oss.oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.