summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEdward Shishkin <edward.shishkin@gmail.com>2010-10-30 00:11:50 +0200
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-01-17 10:44:30 -0600
commit38a708d7759476318d0eec64af174513032ec67a (patch)
treee3cd94359191e72c26ea6a0ecc37c1933b9dcc71 /fs
parente78bf5e6cbe837daa6ab628a5f679548742994d3 (diff)
downloadop-kernel-dev-38a708d7759476318d0eec64af174513032ec67a.zip
op-kernel-dev-38a708d7759476318d0eec64af174513032ec67a.tar.gz
ecryptfs: fix truncation error in ecryptfs_read_update_atime
This is similar to the bug found in direct-io not so long ago. Fix up truncation (ssize_t->int). This only matters with >2G reads/writes, which the kernel doesn't permit. Signed-off-by: Edward Shishkin <edward.shishkin@gmail.com> Cc: Jeff Moyer <jmoyer@redhat.com> Cc: Christoph Hellwig <hch@infradead.org> Cc: Eric Sandeen <esandeen@redhat.com> Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ecryptfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 91da029..679817e 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -47,7 +47,7 @@ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb,
const struct iovec *iov,
unsigned long nr_segs, loff_t pos)
{
- int rc;
+ ssize_t rc;
struct dentry *lower_dentry;
struct vfsmount *lower_vfsmount;
struct file *file = iocb->ki_filp;
OpenPOWER on IntegriCloud