2008-02-07 06:22:41

by David Teigland

[permalink] [raw]
Subject: [PATCH 12/16] dlm: fix dlm_dir_lookup() handling of too long names

From: Al Viro <[email protected]>

... those can happen and BUG() from DLM_ASSERT() in allocate_direntry() is
not a good way to handle them.

Signed-off-by: Al Viro <[email protected]>
Signed-off-by: David Teigland <[email protected]>
---
fs/dlm/dir.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fs/dlm/dir.c b/fs/dlm/dir.c
index 831050e..85defeb 100644
--- a/fs/dlm/dir.c
+++ b/fs/dlm/dir.c
@@ -319,6 +319,9 @@ static int get_entry(struct dlm_ls *ls, int nodeid, char *name,

write_unlock(&ls->ls_dirtbl[bucket].lock);

+ if (namelen > DLM_RESNAME_MAXLEN)
+ return -EINVAL;
+
de = kzalloc(sizeof(struct dlm_direntry) + namelen, GFP_KERNEL);
if (!de)
return -ENOMEM;
--
1.5.3.3