diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-01-26 02:22:22 +0100 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2008-02-04 08:25:58 +0100 |
| commit | a5dd06313dbcec3a2c8a5e4a6f3ddb2a8fc72ec9 (patch) | |
| tree | 50927394b52a4fa2d01cb9300cd49c3bb2f014c2 /fs/dlm | |
| parent | dlm: verify that places expecting rcom_lock have packet long enough (diff) | |
| download | linux-a5dd06313dbcec3a2c8a5e4a6f3ddb2a8fc72ec9.tar.xz linux-a5dd06313dbcec3a2c8a5e4a6f3ddb2a8fc72ec9.zip | |
dlm: receive_rcom_lock_args() overflow check
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm')
| -rw-r--r-- | fs/dlm/lock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index 6c605fc10613..0593dd81d46d 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -4271,7 +4271,6 @@ static int receive_rcom_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb, struct dlm_rsb *r, struct dlm_rcom *rc) { struct rcom_lock *rl = (struct rcom_lock *) rc->rc_buf; - int lvblen; lkb->lkb_nodeid = rc->rc_header.h_nodeid; lkb->lkb_ownpid = le32_to_cpu(rl->rl_ownpid); @@ -4288,11 +4287,13 @@ static int receive_rcom_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb, lkb->lkb_astaddr = (void *) (long) (rl->rl_asts & AST_COMP); if (lkb->lkb_exflags & DLM_LKF_VALBLK) { + int lvblen = rc->rc_header.h_length - sizeof(struct dlm_rcom) - + sizeof(struct rcom_lock); + if (lvblen > ls->ls_lvblen) + return -EINVAL; lkb->lkb_lvbptr = dlm_allocate_lvb(ls); if (!lkb->lkb_lvbptr) return -ENOMEM; - lvblen = rc->rc_header.h_length - sizeof(struct dlm_rcom) - - sizeof(struct rcom_lock); memcpy(lkb->lkb_lvbptr, rl->rl_lvb, lvblen); } |