dlm: check allocation
PATCH 2/7 dlm: check allocation
We were assuming the success of an allocation. Problem noticed by Stefan Richter <[email protected]>
Signed-off-by David Teigland <[email protected]>
drivers/dlm/device.c +4 -2
@@ -802,6 +802,8 @@ static int do_user_lock(struct file_infolockinfo again */ if (!li && (kparams->flags &DLM_LKF_PERSISTENT )) { li =allocate_lockinfo (fi, cmd, kparams); +if (!li) +return -ENOMEM ; li->li_lksb.sb_lkid = kparams->lkid; li->li_castaddr = kparams->castaddr;
@@ -914,12 +916,12 @@ static int do_user_unlock(struct file_in li =get_lockinfo (kparams->lkid);if (!li) { li =allocate_lockinfo (fi, cmd, kparams); +if (!li) +return -ENOMEM ;spin_lock (&fi->fi_li_lock);list_add (&li->li_ownerqueue, &fi->fi_li_list);spin_unlock (&fi->fi_li_lock); } -if (!li) -return -ENOMEM ;if (li->li_magic !=LOCKINFO_MAGIC )return -EINVAL ;