forked from Minki/linux
[DLM] zero new user lvbs
A new lvb for a userland lock wasn't being initialized to zero. Signed-off-by: David Teigland <teigland@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
9beeb9f3c5
commit
62a0f62369
@ -3643,7 +3643,7 @@ int dlm_user_request(struct dlm_ls *ls, struct dlm_user_args *ua,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (flags & DLM_LKF_VALBLK) {
|
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) {
|
if (!ua->lksb.sb_lvbptr) {
|
||||||
kfree(ua);
|
kfree(ua);
|
||||||
__put_lkb(ls, lkb);
|
__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;
|
ua = (struct dlm_user_args *)lkb->lkb_astparam;
|
||||||
|
|
||||||
if (flags & DLM_LKF_VALBLK && !ua->lksb.sb_lvbptr) {
|
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) {
|
if (!ua->lksb.sb_lvbptr) {
|
||||||
error = -ENOMEM;
|
error = -ENOMEM;
|
||||||
goto out_put;
|
goto out_put;
|
||||||
|
Loading…
Reference in New Issue
Block a user