From nobody Mon Jun 8 09:49:40 2026 Received: from mail-yx1-f44.google.com (mail-yx1-f44.google.com [74.125.224.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1A3C3A63F2 for ; Fri, 29 May 2026 21:29:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=74.125.224.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780090165; cv=pass; b=sRpLW/LBIDplUR90rA1x6xOYhdkff1UaIjgCy6Ttbo+ip9RZ12t+bA9f0mBFMvJ3rXNx/MXvG0uMhNw2fgjlGKLnaUxJx64VLPlBQ9A0Xbix0wP/iF83HpinLcstez0vV5AHsVccj/e35CaINKvKaw6c+FuwRRXHEJ2pcU9fPUQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780090165; c=relaxed/simple; bh=/67WuF1sIElwuRKFuWOJpIgIfdplw3oytjbU5zph6go=; h=From:In-Reply-To:References:MIME-Version:Date:Message-ID:Subject: To:Cc:Content-Type; b=q5MWCYd/wGG+ce6Y8EbDNinbmfbda2KpOO0HUwhYGu3GBmgrPnjDAwlzqpBTZlFF6iz6RpJRY9cAjTcgJoA54RIiLar34xPzA6LTxM3obYUPSTht7Cyy4NVDxbuUsGJRBRMf9eHDcchmu3OMABHhM1znp0N+YxHl4tsgzda6wdg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=berkeley.edu; spf=pass smtp.mailfrom=berkeley.edu; dkim=pass (2048-bit key) header.d=berkeley.edu header.i=@berkeley.edu header.b=l8HQjN5w; arc=pass smtp.client-ip=74.125.224.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=berkeley.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=berkeley.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=berkeley.edu header.i=@berkeley.edu header.b="l8HQjN5w" Received: by mail-yx1-f44.google.com with SMTP id 956f58d0204a3-66061993121so219068d50.0 for ; Fri, 29 May 2026 14:29:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1780090162; cv=none; d=google.com; s=arc-20240605; b=GozPVPSTg8e6T/wytkSDVPhaJnGxD5Eg2j2/uD6f8hSfmTX3wxQGMyuYu+jknXPecM /XpMh7YA83NWgpHYy5nc9vUeXVO+FJCUxhXVQLTDkZzZ45LHWM/GLj1Vv3CCFRr64umw +tWyT4ZCCnzyK4jqmBvGhcAtU5xrZCcFpPiEXBy7VyAyViHdRFBPWsonpY9TfYAbSddq NPO7UdFmaf8Du/pslPEw8+2aAbYarFHhyLTSDoDegYGqNh+gjOveot4ptWqlhjRW5+b4 JWxzHFQ1e1xDPVNfowNEx6eRTsi67s9v/8/C3CC5vMpV8EIjMTZDzavr3pMHZF+BP9KS u+ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:dkim-signature; bh=XnZXpXNSL8pfJUNmTlEG3bAEL6eBzUrgLTO5+OvTQBo=; fh=kV1fJEmykkuyX/Bzny0+T0oGt/UUbqcwl2WoFV7jqvI=; b=YLBQ2O+Y9XcBCOzfYeSmBgbjdJObmseFn2HCEoHT6zNd3m/L6xqw7JowP+5y1Qwewb 3wYHVPsyVzAlpEgru+xnC2yL0e4u2ehSiwJyjpeplYlYWJJr5c4PhZMtm5hM8Hc1FPcb OLIjDefls6b9h/fth2K8FUxIM9XN2WO1qqtc2t1ZJOYKnvvyOPxr+++R50gbFI65oZ5i NamC7DB3spjkUh+WeentMBKYyGqKsj0LIn99N6E2EgpD5Phjeo6n6V0siGZWdzxClwEs ek9CwpoMJHh/RBNvgc/YW+pTY8ic7bZFnx8ST3TvMBl+/LXBrmemiAaWaC/kR9g/XNOO 2ZmA==; darn=vger.kernel.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=berkeley.edu; s=google; t=1780090162; x=1780694962; darn=vger.kernel.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=XnZXpXNSL8pfJUNmTlEG3bAEL6eBzUrgLTO5+OvTQBo=; b=l8HQjN5wZKc/XGgpP8EI6sI8js56YwHmB3JP5daKJgBY7ul9mE30gvV4xcwumfL97t vd7GwicpohA/m0TmUWjkdfRymgaXnpTpCigvmuYs7yMmdIW7DU9g1gWipRvHzK+g4d4h WrPIAaTv5YCvnmb6XX6P93eJ7OoRroC7fjh8MMgS9wS0BBlWSTe/Dt1hvgE0RUIRRS8Y ggHQtQR1+khVbDWxVf7rM5sLcRgkYGFaCEAoC6bbsOe9SqKth8L63NB+BW1cch7QOJUS 1JSYTkBpLR5NlK9nqIrnB+VxARvU9EBEqyoVkmKoidkpGf/dY3QsHP2KcKzk80G4GjtD 9ejg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780090162; x=1780694962; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XnZXpXNSL8pfJUNmTlEG3bAEL6eBzUrgLTO5+OvTQBo=; b=A5Ol6UtsxBX2IsVxNM4wMurFkBYQ1fO+WKM4d8RPXxDjP2occ8vO1lPLK57ql2VtVc W3NL2W8+R75IrCqPXNRdk/ua4Dnb4QUmjBXnmQDphVfyJ2Sv3nt4dMdPxAGGaBqNgp68 G+sDxgGDaakJ3cBzdKGdvv8An3sycHR5VQXat+zETBxaLVwC638hYa4I24KwS7feNRx1 0338OGEvxBIuKymqyH9wNv4yZhGSyrGymPxfugxe00mYjFkq8S8B8ueaIi25xkfGeJDX +tin/IiosMc5NJVARhcKQ+QrohV1qX+N8ohLlw4OvNzpUEAGv/kjlBLT1U7p1RgOMsYo 6NDA== X-Forwarded-Encrypted: i=1; AFNElJ86MSXelJZIrqGbLIgUCHEH6kbJ/9f2lCywiqc1hmr8arbB4Dr4yji6578f3Hov9g0avY4VqlQMHHwtMEI=@vger.kernel.org X-Gm-Message-State: AOJu0YzF4ucGuPWk8yAp696LcYEz1otI9Zb6NOhQT97N2jvnL+IGb0fy 1IYwFwLOKl6WoFmRoCBo89De7/pOKPH88oMd7NA59vZlAQGXWRVGDJ0F5DpjZDbdTWbgcHkdwkB hVjbxNVLYvoracO5fzIi2UYE/nJZrBdXOcFtkc9SsCEgoMd/u4hGWf8a2 X-Gm-Gg: Acq92OGj4zCMg76CEfIOCcI+eNYByr9De4LpAKloNo1GjNbkenvPtZiE1PDbijmMuRi a5YEKeWE0nA2eGFNoRi8bJR4Yln5CwADFaQVwlAMUE+7OwKamKbdDXd/xPXf2qo7JM8xuGvaW3X Jf/FqYKb75bPwBl9bbAhwKF2c6uP3O6lR8CxTrI22ftnPyhaJAKP2ZrcwYrb/n0yquMbOFdBF9Z UigltPlBgcfCKRL+mLZ4850cGCSBWW6yMst7B7cDSh5u9uS8aIX3ogyjYIwtyoot4xs/JlfCg+e xPyQRwcW0mpdKpvq810k X-Received: by 2002:a05:690c:4447:b0:7dd:16e2:7291 with SMTP id 00721157ae682-7e05e474433mr11465077b3.39.1780090161347; Fri, 29 May 2026 14:29:21 -0700 (PDT) Received: from 474444807712 named unknown by gmailapi.google.com with HTTPREST; Fri, 29 May 2026 17:29:20 -0400 Received: from 474444807712 named unknown by gmailapi.google.com with HTTPREST; Fri, 29 May 2026 17:29:20 -0400 From: Farhad Alemi X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Fri, 29 May 2026 17:29:20 -0400 X-Gm-Features: AVHnY4LQFyGSZoj6kwJtD0lO4cHWTv7GfJ7euNTK49i6B1AsmqhFS_1o0YwUu-A Message-ID: Subject: [PATCH v2] freevxfs: don't BUG() on duplicate OLT entries To: Christoph Hellwig Cc: Christian Brauner , linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" vxfs_read_olt() walks the object location table (OLT) and dispatches each entry to vxfs_get_fshead() or vxfs_get_ilist() based on its type. Both helpers BUG_ON() if the per-superblock field they write (vsi_fshino / vsi_iext) is already non-zero, on the unstated assumption that the OLT contains at most one entry of each type. The on-disk format does not enforce that assumption, so a crafted image with two or more FSHEAD or ILIST entries trips the BUG at mount time: kernel BUG at fs/freevxfs/vxfs_olt.c:28! RIP: vxfs_get_ilist fs/freevxfs/vxfs_olt.c:28 [inline] vxfs_read_olt+0x665/0x680 fs/freevxfs/vxfs_olt.c:92 Call Trace: vxfs_fill_super+0x4cd/0x830 fs/freevxfs/vxfs_super.c:251 get_tree_bdev_flags+0x436/0x500 fs/super.c:1698 vfs_get_tree+0x97/0x2b0 fs/super.c:1758 do_new_mount+0x32e/0xa50 fs/namespace.c:3728 __se_sys_mount+0x322/0x420 fs/namespace.c:4216 Rather than treat a malformed on-disk OLT as an internal kernel invariant violation, treat it as bad input and reject the image. Make vxfs_get_fshead() and vxfs_get_ilist() return int (0 on success, -EINVAL on the duplicate condition that previously BUG'd) and check the return in vxfs_read_olt() so its existing fail label runs: brelse(bp) and return -EINVAL. The condition is still flagged with WARN_ON_ONCE() to log the unexpected state; the WARN is retained at the maintainer's request. The malformed image is rejected at mount(2) rather than being silently accepted with attacker-chosen vsi_fshino / vsi_iext values. The existing post-loop sanity check return (infp->vsi_fshino && infp->vsi_iext) ? 0 : -EINVAL; continues to require both fields to be non-zero, so images that supply no FSHEAD or no ILIST are still rejected as before. Behavior for well-formed images is unchanged. The third BUG_ON() in this file (vxfs_oblock's check that bsize divides sbp->s_blocksize) is a different bug class with a different reach path and is left for a separate change. Reported-by: Farhad Alemi Suggested-by: Christoph Hellwig Link: https://lore.kernel.org/lkml/ahVAXetxKFqukggG@infradead.org/ Signed-off-by: Farhad Alemi Reviewed-by: Christoph Hellwig --- Changes since v1 (https://lore.kernel.org/lkml/CA+0ovCji0_+S3pJBd+-00oXHe5FXd7ATr8BWANN+MoUQ= YSs8=3Dw@mail.gmail.com/): * Wrap the duplicate-OLT-entry checks with WARN_ON_ONCE() so the unexpected condition is still logged, per Christoph Hellwig (https://lore.kernel.org/lkml/ahVAXetxKFqukggG@infradead.org/). * Break the if-call lines in vxfs_read_olt() under 80 cols. --- fs/freevxfs/vxfs_olt.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/fs/freevxfs/vxfs_olt.c b/fs/freevxfs/vxfs_olt.c index 23f35187c289..1c0694324135 100644 --- a/fs/freevxfs/vxfs_olt.c +++ b/fs/freevxfs/vxfs_olt.c @@ -15,18 +15,22 @@ #include "vxfs_extern.h" -static inline void +static inline int vxfs_get_fshead(struct vxfs_oltfshead *fshp, struct vxfs_sb_info *infp) { - BUG_ON(infp->vsi_fshino); + if (WARN_ON_ONCE(infp->vsi_fshino)) + return -EINVAL; infp->vsi_fshino =3D fs32_to_cpu(infp, fshp->olt_fsino[0]); + return 0; } -static inline void +static inline int vxfs_get_ilist(struct vxfs_oltilist *ilistp, struct vxfs_sb_info *infp) { - BUG_ON(infp->vsi_iext); + if (WARN_ON_ONCE(infp->vsi_iext)) + return -EINVAL; infp->vsi_iext =3D fs32_to_cpu(infp, ilistp->olt_iext[0]); + return 0; } static inline u_long @@ -86,10 +90,14 @@ vxfs_read_olt(struct super_block *sbp, u_long bsize) =09 switch (fs32_to_cpu(infp, ocp->olt_type)) { case VXFS_OLT_FSHEAD: - vxfs_get_fshead((struct vxfs_oltfshead *)oaddr, infp); + if (vxfs_get_fshead((struct vxfs_oltfshead *)oaddr, + infp)) + goto fail; break; case VXFS_OLT_ILIST: - vxfs_get_ilist((struct vxfs_oltilist *)oaddr, infp); + if (vxfs_get_ilist((struct vxfs_oltilist *)oaddr, + infp)) + goto fail; break; } --=20 2.43.0