lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dlm: make find_rsb() fail gracefully when namelen is too large

Browse Source 
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>
This commit is contained in:
Al Viro
2008-01-25 23:22:26 -05:00
committed by David Teigland
parent a5dd06313d
commit ef58bccab7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/dlm/lock.c
View File

@@ -436,11 +436,15 @@ static int find_rsb(struct dlm_ls *ls, char *name, int namelen,
{ {
struct dlm_rsb *r, *tmp; struct dlm_rsb *r, *tmp;
uint32_t hash, bucket; uint32_t hash, bucket;
int error = 0; int error = -EINVAL;
if (namelen > DLM_RESNAME_MAXLEN)
goto out;
if (dlm_no_directory(ls)) if (dlm_no_directory(ls))
flags |= R_CREATE; flags |= R_CREATE;
error = 0;
hash = jhash(name, namelen, 0); hash = jhash(name, namelen, 0);
bucket = hash & (ls->ls_rsbtbl_size - 1); bucket = hash & (ls->ls_rsbtbl_size - 1);