summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2017-03-16 16:27:47 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-20 10:04:56 +0100
commitfa034538cb041dd79eba2affd76c232eb7aefa2c (patch)
treeeb17ac06b0266493aef41643d463f35d10f0a8f1
parent1efae6ca3418855d3106aef4d763bf2f29b4c04d (diff)
downloadlinux-stable-fa034538cb041dd79eba2affd76c232eb7aefa2c.tar.gz
linux-stable-fa034538cb041dd79eba2affd76c232eb7aefa2c.tar.bz2
linux-stable-fa034538cb041dd79eba2affd76c232eb7aefa2c.zip
afs: Fix the maths in afs_fs_store_data()
[ Upstream commit 146a1192783697810b63a1e41c4d59fc93387340 ] afs_fs_store_data() works out of the size of the write it's going to make, but it uses 32-bit unsigned subtraction in one place that gets automatically cast to loff_t. However, if to < offset, then the number goes negative, but as the result isn't signed, this doesn't get sign-extended to 64-bits when placed in a loff_t. Fix by casting the operands to loff_t. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/afs/fsclient.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/afs/fsclient.c b/fs/afs/fsclient.c
index c775fefe3ffe..0c8399e0fdac 100644
--- a/fs/afs/fsclient.c
+++ b/fs/afs/fsclient.c
@@ -1225,7 +1225,7 @@ int afs_fs_store_data(struct afs_server *server, struct afs_writeback *wb,
_enter(",%x,{%x:%u},,",
key_serial(wb->key), vnode->fid.vid, vnode->fid.vnode);
- size = to - offset;
+ size = (loff_t)to - (loff_t)offset;
if (first != last)
size += (loff_t)(last - first) << PAGE_SHIFT;
pos = (loff_t)first << PAGE_SHIFT;