diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-11-20 15:56:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-20 16:17:32 -0800 |
| commit | 1491e30ed1a741009d1d38f9285f7a29e6c05c78 (patch) | |
| tree | 6a1282ea4dd9ae029ce8cb79092e89fca4dcc2ec | |
| parent | 5cf6a51e6062afe7cc507f32f1e5f7e6497ae844 (diff) | |
| download | op-kernel-dev-1491e30ed1a741009d1d38f9285f7a29e6c05c78.zip op-kernel-dev-1491e30ed1a741009d1d38f9285f7a29e6c05c78.tar.gz | |
ncpfs: don't allow negative timeouts
This code causes a static checker warning because it's a user controlled
variable where we cap the upper bound but not the lower bound. Let's
return an -EINVAL for negative timeouts.
[akpm@linux-foundation.org: remove unneeded `else']
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Jan Kara <jack@suse.com>
Cc: Petr Vandrovec <petr@vandrovec.name>
Cc: David Howells <dhowells@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/ncpfs/ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c index 79b1130..0a3f9b5 100644 --- a/fs/ncpfs/ioctl.c +++ b/fs/ncpfs/ioctl.c @@ -525,6 +525,8 @@ static long __ncp_ioctl(struct inode *inode, unsigned int cmd, unsigned long arg switch (rqdata.cmd) { case NCP_LOCK_EX: case NCP_LOCK_SH: + if (rqdata.timeout < 0) + return -EINVAL; if (rqdata.timeout == 0) rqdata.timeout = NCP_LOCK_DEFAULT_TIMEOUT; else if (rqdata.timeout > NCP_LOCK_MAX_TIMEOUT) |
