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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 285F8C5B543 for ; Thu, 5 Jun 2025 17:30:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB7FE6B00BE; Thu, 5 Jun 2025 13:30:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A68716B00C1; Thu, 5 Jun 2025 13:30:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7F7676B00BE; Thu, 5 Jun 2025 13:30:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 51D7F6B00BF for ; Thu, 5 Jun 2025 13:30:37 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E5F8E121218 for ; Thu, 5 Jun 2025 17:30:36 +0000 (UTC) X-FDA: 83522036472.08.948EBEB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 45E3A40016 for ; Thu, 5 Jun 2025 17:30:35 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=afIGN5Yo; spf=pass (imf11.hostedemail.com: domain of bfoster@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bfoster@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749144635; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Fprpw+4DgNE3ISMvsmQurCKFtzAFsAvCo9SkQM8nkXE=; b=A120qzcq0/F4+aN6YGP0zubX9NmV/vMMHZJ0mdpn6/rjDxOD56cu9fU6CKSMvgWgS7O7iU Sq+q1AJl38nACRWU8KzOwHSVS472uDgGbSc57Y7VvXjyfWZZ1iFMwjgpBs4x3JueinOco+ eRPIIBazAql/1x84hbXfo4G2OUfzUqg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749144635; a=rsa-sha256; cv=none; b=tD5raAbfgzYMKvJUr9SxiD9ZzWlxx+/6FKHN4Y6GkZf+GAoh29Z8EvVc6awBo/GhIUaJMY Z662F/Svlw6sp9YFId4pvmiXRILvNncbhWVoJ1Z/6ho8aPC/mOiYiEPMqG+HGwOO+N8+ux 6zR2suHMjtqioA+5MJ/xAS44SIpxdwY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=afIGN5Yo; spf=pass (imf11.hostedemail.com: domain of bfoster@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bfoster@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749144634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fprpw+4DgNE3ISMvsmQurCKFtzAFsAvCo9SkQM8nkXE=; b=afIGN5YoakLUOMF/T7ND21P7MqSx/AKDG4S+fgJVb+uxxowFn/6e7TyTZz4WJEYTlTju6z S0dytFTcFYigR0sJZbzT8MFrd74sLTV+zfnhdp5/g1pS5RUn7KNkjEdlzlbjL3LScyLJW8 S0rIMNQ+y++RD3Gz07hdR7ytd6BifDA= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-112-6o6q7BhsM0Oy_ARoN9zfpQ-1; Thu, 05 Jun 2025 13:30:30 -0400 X-MC-Unique: 6o6q7BhsM0Oy_ARoN9zfpQ-1 X-Mimecast-MFC-AGG-ID: 6o6q7BhsM0Oy_ARoN9zfpQ_1749144629 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 387B8195608B; Thu, 5 Jun 2025 17:30:29 +0000 (UTC) Received: from bfoster.redhat.com (unknown [10.22.88.123]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5C5B330002C0; Thu, 5 Jun 2025 17:30:28 +0000 (UTC) From: Brian Foster To: linux-fsdevel@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 1/7] iomap: move pos+len BUG_ON() to after folio lookup Date: Thu, 5 Jun 2025 13:33:51 -0400 Message-ID: <20250605173357.579720-2-bfoster@redhat.com> In-Reply-To: <20250605173357.579720-1-bfoster@redhat.com> References: <20250605173357.579720-1-bfoster@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 45E3A40016 X-Stat-Signature: 8a49qpjm7arykoaz9ddakyucb69dzrfe X-Rspam-User: X-HE-Tag: 1749144635-599854 X-HE-Meta: U2FsdGVkX19oJ7spgRrUDxDfcB46qcKYbGC14E/dLNc7ll44bOrkjIbkEJaf62hBgRyTfAuzEJwK5eFynBQ+JLEzoiHczJgBOJwx8mp6bpTV1/HNBV/jsRXMSoa+fAuCMvjwZI9hkT1XHnWNSpAzShO5IhlhRS5s+7Dpj6Hr7L87srJa7NdVGyRw1E+WeR+tKQwxcdKXoXPP+s5YLTJd7hzia6aiBbISc+KjHnFR4Ml5FBfbSBBOtS6mogxJx+gjVoG8JHLOoJkivhyucZpVz4pA3FKeBzEAKDLlTY8RMqVMmUgEJvbYBQdaTfwqzjOOiah6CH51mrI6VL/so2e1E8eiXSduwiU97kULlCYc9W1MJtto3FSp96KHxS24t7kU56icTjFDRLsw/28/imBFoTgpEQ074Pp+V9dVcVTumGkY4JhFV+uihajCokrErBbLvNyF/Laeosk/pSNogaD70af8V1ojq2gFQ1g73AANT0OT8ZAtqaqkTcl6tytZPQ3WRWbscg/jSYHKWHk5DRL+1sVLCY9vaF+Ra1n99fX68NfIePTagApxznHkqEODpQH4M//2Mv11kqyxpa3aiK71Gn9ww9mP/qlnQAKl43brb89LYY64RiRA5Z1IE86i5V3h69S9mKf9s7+qibkswAGht3oVWWvjO+P0gVCvtQ/S2j5yDlmigkGTvGqyb4ffocyx/kHqml0YxjNox/YoXpACYBVGITExcDFIa6agIxXQTFVS87BGHkxVQeaE6/cUlPP7UrPllTuf2vYPuAnoOSMoBY+vv7hIIcx7mtIWOA2WuwnyrE/nEzm+4gqqsLM1epz4v4XGizW3ye0JxmB84CnGSd+lesbhpyT4tXfCxhujJGKDB7qQMPMLH5YQp9sD7UhBA/jitMbIQL+uoGVZ5bSiiUSBwgIxVZH/1TAdhAZAhY9Dz6c4/RYhmR6vRpzZTTFegQ8c0BtnQaUf3mXAxti KCoTsabD sVzkKCLpLytUPYYAEdD0xZ6cdcmPaeMe1zj+ygHNFbDwQ8dub44PNi5kwNb0mTmR0Ovsb/EL223A5eBCEH9xi1pKKvTjPztvK3zEthRF++jkjfuM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The bug checks at the top of iomap_write_begin() assume the pos/len reflect exactly the next range to process. This may no longer be the case once the get folio path is able to process a folio batch from the filesystem. Move the check a bit further down after the folio lookup and range trim to verify everything lines up with the current iomap. Signed-off-by: Brian Foster --- fs/iomap/buffered-io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 3729391a18f3..16499655e7b0 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -805,15 +805,12 @@ static int iomap_write_begin(struct iomap_iter *iter, struct folio **foliop, { const struct iomap_folio_ops *folio_ops = iter->iomap.folio_ops; const struct iomap *srcmap = iomap_iter_srcmap(iter); - loff_t pos = iter->pos; + loff_t pos; u64 len = min_t(u64, SIZE_MAX, iomap_length(iter)); struct folio *folio; int status = 0; len = min_not_zero(len, *plen); - BUG_ON(pos + len > iter->iomap.offset + iter->iomap.length); - if (srcmap != &iter->iomap) - BUG_ON(pos + len > srcmap->offset + srcmap->length); if (fatal_signal_pending(current)) return -EINTR; @@ -843,6 +840,9 @@ static int iomap_write_begin(struct iomap_iter *iter, struct folio **foliop, } pos = iomap_trim_folio_range(iter, folio, poffset, &len); + BUG_ON(pos + len > iter->iomap.offset + iter->iomap.length); + if (srcmap != &iter->iomap) + BUG_ON(pos + len > srcmap->offset + srcmap->length); if (srcmap->type == IOMAP_INLINE) status = iomap_write_begin_inline(iter, folio); -- 2.49.0