Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8376955ybl; Thu, 16 Jan 2020 15:38:51 -0800 (PST) X-Google-Smtp-Source: APXvYqzbkOSXPZTRRv/vwP3vRsdHahO0D392lyzFEMV+A/ffXgIXmYbPr5udZCRtNmlKxAo9SAjy X-Received: by 2002:a9d:198b:: with SMTP id k11mr4220026otk.295.1579217931252; Thu, 16 Jan 2020 15:38:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579217931; cv=none; d=google.com; s=arc-20160816; b=jOr4csQFTGYLZWNpoBY9Hi4/fFU38IrUO96WV/jVNnaIFlIl4CnLdQ+jB7WrQOqh18 dHztak3qHYfl6MNJQzGwccwnFOFNaGH2KN3MVSNy1vc3oak85kZf888FppokC9YXfoHY JKcoYNtrCi2hTaxdD51MCu8/8czrJg5I/D4PpETMmN2YEH2CcNrRtMUZ011v5/EMLvf7 jX3icWvR7NBsDlTits4GcWcAKUF1Zc0RLCnaPT1Z9GWIKeNPIaGM3JKMKKfyJF/EnCZ2 qTJ4OC+JinCb5qgepzg+Lp2bC/vrSjLSmNtL4MibKDNIGkLeGEJ1Mg4xRAOHvIQjqq0+ ZKLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VpPYj6C4frkSFHl7YFzMgwW7dXFF3O08RLgSyQ+h6SY=; b=gThnLxx0R4rxLSchlL7XbUYbT6izQfBJKXM6+vNV5bXozCqpKprVBJC1fGICuLyx5T FZXb+1fRtgz3F7QocVPEcfUcusJHKbfBGhfcQ1isyNgFlvZo09bQqRuV0Ik1BCK6IJzY QDjipad7UAxrqI/KAJOu8fUsgCm/RUUmDAdpNmx1odBfY4zXckP5xG9+E7SF6D/E62fp D/W1NX04K7B2T7riZOvFoVCi8ioAQuSyscZh22xvGshMabv/F1SvebrmxIk8pDLwSYpy HrDqUxwksm55RA3wJhN3iYJ/pMkQ5daOqRXI7yfIj4MZBz+eK1Rvy2z3bQeK0jrhbN52 LpwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wq5MFaXb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p6si12370555oig.88.2020.01.16.15.38.39; Thu, 16 Jan 2020 15:38:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wq5MFaXb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391492AbgAPXbS (ORCPT + 99 others); Thu, 16 Jan 2020 18:31:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:36574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391366AbgAPXaG (ORCPT ); Thu, 16 Jan 2020 18:30:06 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 075F52072E; Thu, 16 Jan 2020 23:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217405; bh=aO7qYF9fBvj0Ws7iK4BpxtcIgvZOMDtzdIeVgfd0YsU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wq5MFaXbrn45nq/4sKRHqL8y8NCCvcWDWu2xd4r9p3IvCvqymQ7uotCznSP+RgGjD beUtPWZB/bg/u9BmEyP7qHM5SeMjTPNHGa4UiHVAoGoFG9PMu0RtPI9hVVO9EWv8DF T1oo873aC5FkeZFiywukxiQWf/B2aNabUHdij1M0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim Subject: [PATCH 4.19 70/84] f2fs: fix potential overflow Date: Fri, 17 Jan 2020 00:18:44 +0100 Message-Id: <20200116231721.809019996@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231713.087649517@linuxfoundation.org> References: <20200116231713.087649517@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu commit 1f0d5c911b64165c9754139a26c8c2fad352c132 upstream. We expect 64-bit calculation result from below statement, however in 32-bit machine, looped left shift operation on pgoff_t type variable may cause overflow issue, fix it by forcing type cast. page->index << PAGE_SHIFT; Fixes: 26de9b117130 ("f2fs: avoid unnecessary updating inode during fsync") Fixes: 0a2aa8fbb969 ("f2fs: refactor __exchange_data_block for speed up") Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Greg Kroah-Hartman --- fs/f2fs/data.c | 2 +- fs/f2fs/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1857,7 +1857,7 @@ static int __write_data_page(struct page loff_t i_size = i_size_read(inode); const pgoff_t end_index = ((unsigned long long) i_size) >> PAGE_SHIFT; - loff_t psize = (page->index + 1) << PAGE_SHIFT; + loff_t psize = (loff_t)(page->index + 1) << PAGE_SHIFT; unsigned offset = 0; bool need_balance_fs = false; int err = 0; --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1101,7 +1101,7 @@ static int __clone_blkaddrs(struct inode } dn.ofs_in_node++; i++; - new_size = (dst + i) << PAGE_SHIFT; + new_size = (loff_t)(dst + i) << PAGE_SHIFT; if (dst_inode->i_size < new_size) f2fs_i_size_write(dst_inode, new_size); } while (--ilen && (do_replace[i] || blkaddr[i] == NULL_ADDR));