* [Ocfs2-devel] [PATCH V2] ocfs2: Fix locking for res->tracking and dlm->tracking_list
@ 2018-06-25 18:26 Ashish Samant
2018-06-26 0:49 ` Changwei Ge
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Ashish Samant @ 2018-06-25 18:26 UTC (permalink / raw)
To: ocfs2-devel
In dlm_init_lockres() 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 instead of dlm->spinlock.
Signed-off-by: Ashish Samant <ashish.samant@oracle.com>
CC: stable at vger.kernel.org
---
fs/ocfs2/dlm/dlmmaster.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Ocfs2-devel] [PATCH V2] ocfs2: Fix locking for res->tracking and dlm->tracking_list
2018-06-25 18:26 [Ocfs2-devel] [PATCH V2] ocfs2: Fix locking for res->tracking and dlm->tracking_list Ashish Samant
@ 2018-06-26 0:49 ` Changwei Ge
2018-06-26 1:22 ` Joseph Qi
2018-06-26 5:39 ` piaojun
2 siblings, 0 replies; 4+ messages in thread
From: Changwei Ge @ 2018-06-26 0:49 UTC (permalink / raw)
To: ocfs2-devel
Looks good to me.
On 2018/6/26 2:26, Ashish Samant wrote:
> In dlm_init_lockres() 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 instead of dlm->spinlock.
Reviewed-by: Changwei Ge <ge.changwei@h3c.com>
> Signed-off-by: Ashish Samant <ashish.samant@oracle.com>
> CC: stable at vger.kernel.org
> ---
> fs/ocfs2/dlm/dlmmaster.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> 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));
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Ocfs2-devel] [PATCH V2] ocfs2: Fix locking for res->tracking and dlm->tracking_list
2018-06-25 18:26 [Ocfs2-devel] [PATCH V2] ocfs2: Fix locking for res->tracking and dlm->tracking_list Ashish Samant
2018-06-26 0:49 ` Changwei Ge
@ 2018-06-26 1:22 ` Joseph Qi
2018-06-26 5:39 ` piaojun
2 siblings, 0 replies; 4+ messages in thread
From: Joseph Qi @ 2018-06-26 1:22 UTC (permalink / raw)
To: ocfs2-devel
On 18/6/26 02:26, Ashish Samant wrote:
> In dlm_init_lockres() 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 instead of dlm->spinlock.
>
> Signed-off-by: Ashish Samant <ashish.samant@oracle.com>
> CC: stable at vger.kernel.org
Acked-by: Joseph Qi <jiangqi903@gmail.com>
> ---
> fs/ocfs2/dlm/dlmmaster.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> 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));
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Ocfs2-devel] [PATCH V2] ocfs2: Fix locking for res->tracking and dlm->tracking_list
2018-06-25 18:26 [Ocfs2-devel] [PATCH V2] ocfs2: Fix locking for res->tracking and dlm->tracking_list Ashish Samant
2018-06-26 0:49 ` Changwei Ge
2018-06-26 1:22 ` Joseph Qi
@ 2018-06-26 5:39 ` piaojun
2 siblings, 0 replies; 4+ messages in thread
From: piaojun @ 2018-06-26 5:39 UTC (permalink / raw)
To: ocfs2-devel
LGTM
On 2018/6/26 2:26, Ashish Samant wrote:
> In dlm_init_lockres() 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 instead of dlm->spinlock.
>
> Signed-off-by: Ashish Samant <ashish.samant@oracle.com>
Acked-by: Jun Piao <piaojun@huawei.com>
> CC: stable at vger.kernel.org
> ---
> fs/ocfs2/dlm/dlmmaster.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> 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));
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-06-26 5:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-25 18:26 [Ocfs2-devel] [PATCH V2] ocfs2: Fix locking for res->tracking and dlm->tracking_list Ashish Samant
2018-06-26 0:49 ` Changwei Ge
2018-06-26 1:22 ` Joseph Qi
2018-06-26 5:39 ` piaojun
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.