diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-04-23 15:24:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-12 14:57:04 -0700 |
| commit | 4075a923acbf1ab6b21e021c13cae4c4055e5277 (patch) | |
| tree | 986925c6f916dace429e646e3b3c08272a5fed7b /fs | |
| parent | c8f299e543caa5f88c4389c0bed5ef47bdf43970 (diff) | |
| download | lwn-4075a923acbf1ab6b21e021c13cae4c4055e5277.tar.gz lwn-4075a923acbf1ab6b21e021c13cae4c4055e5277.zip | |
ocfs2_dlmfs: Fix math error when reading LVB.
commit a36d515c7a2dfacebcf41729f6812dbc424ebcf0 upstream.
When asked for a partial read of the LVB in a dlmfs file, we can
accidentally calculate a negative count.
Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/dlm/dlmfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c index 02bf17808bdc..18bc101d603f 100644 --- a/fs/ocfs2/dlm/dlmfs.c +++ b/fs/ocfs2/dlm/dlmfs.c @@ -205,7 +205,7 @@ static ssize_t dlmfs_file_read(struct file *filp, if ((count + *ppos) > i_size_read(inode)) readlen = i_size_read(inode) - *ppos; else - readlen = count - *ppos; + readlen = count; lvb_buf = kmalloc(readlen, GFP_NOFS); if (!lvb_buf) |