| From a36d515c7a2dfacebcf41729f6812dbc424ebcf0 Mon Sep 17 00:00:00 2001 |
| From: Joel Becker <joel.becker@oracle.com> |
| Date: Fri, 23 Apr 2010 15:24:59 -0700 |
| Subject: ocfs2_dlmfs: Fix math error when reading LVB. |
| |
| From: Joel Becker <joel.becker@oracle.com> |
| |
| 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> |
| |
| --- |
| fs/ocfs2/dlm/dlmfs.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/ocfs2/dlm/dlmfs.c |
| +++ b/fs/ocfs2/dlm/dlmfs.c |
| @@ -205,7 +205,7 @@ static ssize_t dlmfs_file_read(struct fi |
| 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) |
