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

Commit de0e2a92 authored by Ashish Samant's avatar Ashish Samant Committed by Greg Kroah-Hartman
Browse files

ocfs2: fix locking for res->tracking and dlm->tracking_list 

commit cbe355f5 upstream.

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.

Link: http://lkml.kernel.org/r/1529951192-4686-1-git-send-email-ashish.samant@oracle.com


Signed-off-by: default avatarAshish Samant <ashish.samant@oracle.com>
Reviewed-by: default avatarChangwei Ge <ge.changwei@h3c.com>
Acked-by: default avatarJoseph Qi <jiangqi903@gmail.com>
Acked-by: default avatarJun Piao <piaojun@huawei.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <ge.changwei@h3c.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f8566a92

fs/ocfs2/dlm/dlmmaster.c

+2 −2
Original line number Diff line number Diff line
@@ -589,9 +589,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));