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;
From:   OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     linux-kernel@vger.kernel.org, "Wang\, Matt" <Matt.Wang@Dell.com>,
        "dan.carpenter\@oracle.com" <dan.carpenter@oracle.com>
Subject: [PATCH] fat: Fix potential shift wrap with FITRIM ioctl on FAT
References: <C8ECE1B7A767434691FEEFA3A01765D72AF77119@MX203CL03.corp.emc.com>
Date:   Fri, 13 Jul 2018 15:47:08 +0900
In-Reply-To: <C8ECE1B7A767434691FEEFA3A01765D72AF77119@MX203CL03.corp.emc.com>
        (Matt Wang's message of "Fri, 13 Jul 2018 03:37:23 +0000")
Message-ID: <87h8l37hub.fsf@mail.parknet.co.jp>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

This patch is the fix of fat-add-fitrim-ioctl-for-fat-file-system.patch.
Maybe better to merge with it (if it is easy).

Anyway, please apply this with above patch.

--------
From: Wentao Wang <witallwang@gmail.com>

If we keep "trimmed" as an u32, there will be a potential shift wrap.

It would be a problem on a larger than 4GB partition with
FAT32. Though most tools who call this ioctl would ignore this value,
it would be great to fix it.

Signed-off-by: Wentao Wang <witallwang@gmail.com>
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
---

 fs/fat/fatent.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN fs/fat/fatent.c~fat-fitrim-fix fs/fat/fatent.c
--- linux/fs/fat/fatent.c~fat-fitrim-fix	2018-07-13 15:39:14.417110998 +0900
+++ linux-hirofumi/fs/fat/fatent.c	2018-07-13 15:39:14.418110996 +0900
@@ -705,8 +705,8 @@ int fat_trim_fs(struct inode *inode, str
 	struct msdos_sb_info *sbi = MSDOS_SB(sb);
 	const struct fatent_operations *ops = sbi->fatent_ops;
 	struct fat_entry fatent;
-	u64 ent_start, ent_end, minlen;
-	u32 free = 0, trimmed = 0;
+	u64 ent_start, ent_end, minlen, trimmed = 0;
+	u32 free = 0;
 	unsigned long reada_blocks, reada_mask, cur_block = 0;
 	int err = 0;
 
_

-- 
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>