diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-04-23 15:24:59 -0700 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-04-23 15:24:59 -0700 |
| commit | a36d515c7a2dfacebcf41729f6812dbc424ebcf0 (patch) | |
| tree | 4ff912d4f3c8697eb19beaed2d9b8cb9c551457b /fs/ocfs2/dlmfs/dlmfs.c | |
| parent | c21a534e2f24968cf74976a4e721ac194db30ded (diff) | |
| download | talos-obmc-linux-a36d515c7a2dfacebcf41729f6812dbc424ebcf0.tar.gz talos-obmc-linux-a36d515c7a2dfacebcf41729f6812dbc424ebcf0.zip | |
ocfs2_dlmfs: Fix math error when reading LVB.
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>
Cc: <stable@kernel.org>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/dlmfs/dlmfs.c')
| -rw-r--r-- | fs/ocfs2/dlmfs/dlmfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c index a99d1eafa8e2..b83d6107a1f5 100644 --- a/fs/ocfs2/dlmfs/dlmfs.c +++ b/fs/ocfs2/dlmfs/dlmfs.c @@ -262,7 +262,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) |
