diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-01-26 05:22:26 +0100 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2008-02-04 08:26:31 +0100 |
| commit | ef58bccab7c7ef34451aa4ceea39545ef126b666 (patch) | |
| tree | 56cdbdeba5db2cdca3e3f96a7124a4f83c56e791 /fs/dlm/lock.c | |
| parent | dlm: receive_rcom_lock_args() overflow check (diff) | |
| download | linux-ef58bccab7c7ef34451aa4ceea39545ef126b666.tar.xz linux-ef58bccab7c7ef34451aa4ceea39545ef126b666.zip | |
dlm: make find_rsb() fail gracefully when namelen is too large
We *can* get there from receive_request() and dlm_recover_master_copy()
with namelen too large if incoming request is invalid; BUG() from
DLM_ASSERT() in allocate_rsb() is a bit excessive reaction to that
and in case of dlm_recover_master_copy() we would actually oops before
that while calculating hash of up to 64Kb worth of data - with data
actually being 64 _bytes_ in kmalloc()'ed struct.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/lock.c')
| -rw-r--r-- | fs/dlm/lock.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index 0593dd81d46d..6d98cf9d043d 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -436,11 +436,15 @@ static int find_rsb(struct dlm_ls *ls, char *name, int namelen, { struct dlm_rsb *r, *tmp; uint32_t hash, bucket; - int error = 0; + int error = -EINVAL; + + if (namelen > DLM_RESNAME_MAXLEN) + goto out; if (dlm_no_directory(ls)) flags |= R_CREATE; + error = 0; hash = jhash(name, namelen, 0); bucket = hash & (ls->ls_rsbtbl_size - 1); |