From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 450B7471432; Tue, 21 Jul 2026 17:51:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784656303; cv=none; b=DFhnLNu/x+22pTp7lojLZ20jSsuza/rOjU5oWzjGhzVG1g0WPtFHv89HlWCtE+hcLqVgd8hm/uJERydbBM90s1lxH2jVJcFonPAlAg4OkavFXQoXfmuo1PPm1nNbgxVGpjnI0lxMtIuj41P5hLLKDryCKG2mROK6hXWmZWFP3yU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784656303; c=relaxed/simple; bh=899drmQgO1ZPPkCo8a0nNpieSzQQ+T2R02J4mFFWfj0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ADC3/S/NRP0BIYXvd2jrk1117bQd/f2vG9p+Ey1nFouU54uLIm5vDWF77hKTqA7r8/Qxt9CPchoN87jBWhomqlSVo1SuHSF1tpeXTOGb8ylQZwrQ4MhHiZaTpQobZ/q6dbK7Wat7oZL3mOBhq/7uQlQTp5p+v9daxW+2VEggOXI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=umOGuhzi; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="umOGuhzi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B15391F000E9; Tue, 21 Jul 2026 17:51:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784656302; bh=wzTr8amATfWC6Dwud92yNI5i8ky35Q7MJMO7ObdsMS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=umOGuhzi8q9f5+iQoVe9zBIB7dwd87U7fAnGvcsrteYkErTKfJKrxdD3cciffTCWX 6EvfCcmTFUBAaAXQ2BsZGVNfP/6Kk835cK2AaQ5Oh4pzcekkkEL+LyT/BQtzXjzWmG 2/ZL5YcSNoqgybG9A1naZNYp/sMhLYEO0hxAgydc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhang Cen , Joseph Qi , Mark Fasheh , Joel Becker , Junxiao Bi , Changwei Ge , Jun Piao , Heming Zhao , Andrew Morton , Sasha Levin Subject: [PATCH 6.18 0337/1611] ocfs2: reject FITRIM ranges shorter than a cluster Date: Tue, 21 Jul 2026 17:07:33 +0200 Message-ID: <20260721152522.682530857@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhang Cen [ Upstream commit ca1afd88f5eaaff9168e1466e5401385edf59543 ] ocfs2_trim_mainbm() trims the global bitmap in cluster units, but its too-short range validation only checks sb->s_blocksize. On filesystems with a cluster size larger than the block size, a FITRIM range that is at least one block but shorter than one cluster is accepted and shifted down to len == 0. The later start + len - 1 and len -= ... arithmetic then underflows and can drive trimming past the requested range. Reject ranges shorter than s_clustersize instead. That preserves the existing -EINVAL behavior for requests that cannot discard even one allocation unit and keeps zero-cluster trims out of the group walk. Link: https://lore.kernel.org/20260528151247.361854-1-rollkingzzc@gmail.com Fixes: aa89762c5480 ("ocfs2: return EINVAL if the given range to discard is less than block size") Assisted-by: Codex:gpt-5.5 Signed-off-by: Zhang Cen Reviewed-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Jun Piao Cc: Heming Zhao Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- fs/ocfs2/alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index a0ced11e0c24ab..fb7d8dc2129be6 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -7564,7 +7564,7 @@ int ocfs2_trim_mainbm(struct super_block *sb, struct fstrim_range *range) len = range->len >> osb->s_clustersize_bits; minlen = range->minlen >> osb->s_clustersize_bits; - if (minlen >= osb->bitmap_cpg || range->len < sb->s_blocksize) + if (minlen >= osb->bitmap_cpg || range->len < osb->s_clustersize) return -EINVAL; trace_ocfs2_trim_mainbm(start, len, minlen); -- 2.53.0