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

Commit 62a0f623 authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse
Browse files

[DLM] zero new user lvbs 



A new lvb for a userland lock wasn't being initialized to zero.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 9beeb9f3

fs/dlm/lock.c

+2 −2
Original line number Diff line number Diff line
@@ -3643,7 +3643,7 @@ int dlm_user_request(struct dlm_ls *ls, struct dlm_user_args *ua, 
	}



	if (flags & DLM_LKF_VALBLK) {

		ua->lksb.sb_lvbptr = kmalloc(DLM_USER_LVB_LEN, GFP_KERNEL);

		ua->lksb.sb_lvbptr = kzalloc(DLM_USER_LVB_LEN, GFP_KERNEL);

		if (!ua->lksb.sb_lvbptr) {

			kfree(ua);

			__put_lkb(ls, lkb);
@@ -3712,7 +3712,7 @@ int dlm_user_convert(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, 
	ua = (struct dlm_user_args *)lkb->lkb_astparam;



	if (flags & DLM_LKF_VALBLK && !ua->lksb.sb_lvbptr) {

		ua->lksb.sb_lvbptr = kmalloc(DLM_USER_LVB_LEN, GFP_KERNEL);

		ua->lksb.sb_lvbptr = kzalloc(DLM_USER_LVB_LEN, GFP_KERNEL);

		if (!ua->lksb.sb_lvbptr) {

			error = -ENOMEM;

			goto out_put;