From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21C51C388F7 for ; Mon, 9 Nov 2020 13:44:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB9262068D for ; Mon, 9 Nov 2020 13:44:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604929458; bh=hQGQLSdykrNiuibfycAaSYtyg4jvgoI7l7yxa74N1Mo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=liVkUm71NwZ1v1UUQRc8Gv16Mfx+5P11Ksh0FF/2WNd0tGSAb+w2dbx+LhbxtgLAe 0coNBGgrmS3C30iEkr6iCkfsGNQbFwJhqVCA6Uk2MLO2XFVDohTjAouX6Z6ymbpyXO QxGxcQRN9KIPr4p9ZtWVZL4EYBUAIfz7Y9B2Un5g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732417AbgKINoR (ORCPT ); Mon, 9 Nov 2020 08:44:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:53540 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730303AbgKIM7R (ORCPT ); Mon, 9 Nov 2020 07:59:17 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AE17A2076E; Mon, 9 Nov 2020 12:59:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604926757; bh=hQGQLSdykrNiuibfycAaSYtyg4jvgoI7l7yxa74N1Mo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JkBcaatO18182q6lBf8rruY5cQZnE6Hwj4jkjzmtGH+9mdHGN8kaNoFof6xqlynrV gUtplVbLYrv/qv305lk8T3yqPgUA/zqZ+Qv9ZC3fI437+NZ9/pyC4CeLqEGwZezNGx Jem/rnStdBydvu+2w5KaA6qQdgXASKg9fxkBxPfY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Matthew Wilcox (Oracle)" , Jeff Layton , Ilya Dryomov Subject: [PATCH 4.4 50/86] ceph: promote to unsigned long long before shifting Date: Mon, 9 Nov 2020 13:54:57 +0100 Message-Id: <20201109125023.230156501@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125020.852643676@linuxfoundation.org> References: <20201109125020.852643676@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Wilcox (Oracle) 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) Reviewed-by: Jeff Layton Signed-off-by: Ilya Dryomov Signed-off-by: Greg Kroah-Hartman --- fs/ceph/addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -1243,7 +1243,7 @@ static int ceph_filemap_fault(struct vm_ 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_CACHE_SHIFT; + loff_t off = (loff_t)vmf->pgoff << PAGE_CACHE_SHIFT; int want, got, ret; dout("filemap_fault %p %llx.%llx %llu~%zd trying to get caps\n",