diff options
| author | mkmm@gmx-topmail.de <mkmm@gmx-topmail.de> | 2010-10-05 13:00:06 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@suse.cz> | 2010-10-05 13:00:06 +0200 |
| commit | ec4a01f94389ce01d667641c77cd34608c72c6f3 (patch) | |
| tree | 3e69ef237e903367e8658642f2b8fc559404b944 | |
| parent | 824b4ce6acd676e13cfa216dfbb5dbf4380781a0 (diff) | |
| download | libfuse-ec4a01f94389ce01d667641c77cd34608c72c6f3.tar.gz | |
add missing argument check in ulockmgr.c
Add missing argument check in ulockmgr.c to prevent calling
ulockmgr_server with illegal arguments. This would cause an ever growing
list of ulockmgr_server processes with an endless list of open files which
finally exceeds the open file handle limit.
It appears samba is sometimes calling flock with illegal / weired values.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/ulockmgr.c | 4 |
2 files changed, 12 insertions, 0 deletions
@@ -1,3 +1,11 @@ +2010-10-05 Miklos Szeredi <miklos@szeredi.hu> + + * Add missing argument check in ulockmgr.c to prevent calling + ulockmgr_server with illegal arguments. This would cause an ever + growing list of ulockmgr_server processes with an endless list of + open files which finally exceeds the open file handle limit. + Patch by Markus Ammer + 2010-09-28 Miklos Szeredi <miklos@szeredi.hu> * Fix option escaping for fusermount. If the "fsname=" option diff --git a/lib/ulockmgr.c b/lib/ulockmgr.c index 6703cd0..b875c50 100644 --- a/lib/ulockmgr.c +++ b/lib/ulockmgr.c @@ -400,6 +400,10 @@ int ulockmgr_op(int fd, int cmd, struct flock *lock, const void *owner, if (cmd != F_GETLK && cmd != F_SETLK && cmd != F_SETLKW) return -EINVAL; + if (lock->l_type != F_RDLCK && lock->l_type != F_WRLCK && + lock->l_type != F_UNLCK) + return -EINVAL; + if (lock->l_whence != SEEK_SET && lock->l_whence != SEEK_CUR && lock->l_whence != SEEK_END) return -EINVAL; |