summaryrefslogtreecommitdiffstats
path: root/fs/ceph
diff options
context:
space:
mode:
authorMatthew Wilcox (Oracle) <willy@infradead.org>2020-10-04 19:04:24 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-05 11:08:53 +0100
commit4f3b78e25a073115c52b064c9f35e6a9aa39e566 (patch)
treed8d1fb378abc7748487a5c6b1c53878400c8ff9f /fs/ceph
parent0ac2a7bcff3717da75acec69fff4728a22bea383 (diff)
downloadlinux-stable-4f3b78e25a073115c52b064c9f35e6a9aa39e566.tar.gz
linux-stable-4f3b78e25a073115c52b064c9f35e6a9aa39e566.tar.bz2
linux-stable-4f3b78e25a073115c52b064c9f35e6a9aa39e566.zip
ceph: promote to unsigned long long before shifting
commit c403c3a2fbe24d4ed33e10cabad048583ebd4edf upstream. On 32-bit systems, this shift will overflow for files larger than 4GB. Cc: stable@vger.kernel.org Fixes: 61f68816211e ("ceph: check caps in filemap_fault and page_mkwrite") Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/addr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 476728bdae8c..e59b2f53a81f 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -1437,7 +1437,7 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf)
struct ceph_inode_info *ci = ceph_inode(inode);
struct ceph_file_info *fi = vma->vm_file->private_data;
struct page *pinned_page = NULL;
- loff_t off = vmf->pgoff << PAGE_SHIFT;
+ loff_t off = (loff_t)vmf->pgoff << PAGE_SHIFT;
int want, got, err;
sigset_t oldset;
vm_fault_t ret = VM_FAULT_SIGBUS;