From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f42.google.com (mail-pj2-f42.google.com [74.125.227.170]) (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 A1C6B3546F0 for ; Mon, 21 Sep 2026 04:25:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789964720; cv=none; b=OhjSxSXmVWLbqYsW71kPAaIYyIsKrYcyn5pmK/K2KXTHo+aOTESLM9ZsWUQ9UGTm8JdLDZs1yj8chuyCyBnmZSroUV12e0xS29N8sZ7MG/SXXVIuyWI3vq3+14rd7htTyZJqdQSBNKGM8I5ru1B/WTAP99B36hr1sELU8KMSNjs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789964720; c=relaxed/simple; bh=UXX242uwM9CJbd75dgBpovw7CdyRLI0nhFevS4pmY30=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J4GeJcASrvq+vpxYBCLr4GIx5/Jubxe5Yha51eaL4Dd6I9W92ft3RX3OJ4BWQsmMfkhoo7GuJ2CuOTRg9TJ+YD0xEtmPvyhAcs/Vw9GF2Q2/DvTa7cgj96bxijMiCCqnOoAIJH7izOV1OKLk1RJ11E9qAylMspQuLSngYYJvKxc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AYZIovRZ; arc=none smtp.client-ip=74.125.227.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AYZIovRZ" Received: by mail-pj2-f42.google.com with SMTP id 98e67ed59e1d1-396ccda24afso1795172a91.3 for ; Sun, 20 Sep 2026 21:25:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789964715; x=1790569515; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=KlcejhybFRwk+waXcujN7WP0JBvoJyfPnbBAG+LwQp8=; b=AYZIovRZoyIsUjyI3U/Z4K4eWjMmJ3TNkBIREnYW4m97iy1yqLPdxVjaWepLcxvM9Z k0DJMAmW93hnBL36osPKT2sxw3E/eC4Te+nHiD/aU9cnotZix4LPwlV4OmfkHqXfD3+/ 7FJv5uc9ts5aYh5WcZBzDEB184slHv6028uHiOuCFrLucXF/d5SASqe/JhETxxFHOsjH zwQug/GI6lgh4aUap2YCeI0UL9LmsNqfDtUL9yw9R/TE51GN/LEei/HSY370NamadSMj 6d71YovcZnGL8LShcuiPWSASjnnzsaqqQ40WAYwhtLJuuoNCevhyANoLsLW1ftMXJ566 qYNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789964715; x=1790569515; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=KlcejhybFRwk+waXcujN7WP0JBvoJyfPnbBAG+LwQp8=; b=nXw5xhDNmuMUOILECLqrThZ8Shnalcj+gja+i74FROgrLeHZCXoLZNhZTYttEk/LXR WM0krT6haRFJv3Cs4HJbMDwNHH5A3chns/CaswXJiig/randulnDprxtBEtVg/Yjbk88 dtc0ulIwM6aLKv1f6W0ad05ncXDSShgVGtDJEF/aaJ2oo86ehTZ+GKHADEp4wDE+o5Vb lZrve7T0GpsL3KNkhXftBdMSesjmPfcUECnD5UnegUb7v5TJaeDjdaZvtLZE7JDxhM9d IOXjO8sZaBOO7luyfiZfJbHM4Yq/z7y7KnKgMMnKNDwcmve8Xs2CDsGgRLGD+ZC0bvkQ YCCw== X-Gm-Message-State: AFuF++lB7oCO8RxMrl6pSX6TQ5rfAChluSeM0B/D5QbAjF4eW3hnKPBR Tr5CoykSZhpryvfGK8drmxaEW3II/b5tvIxQfT+VsZ0V99AGfy1hkuxd X-Gm-Gg: AYBFou0KzOF5D3xp/aMU9iupR+Qo/L1HXByVCaBmUM937509ADLTAfUvwxizwcHoOfu CEFTo8tGKwWixR90BwuEq6MIQABVI+d7Ke/9x+0AbSKZxqDllCLqNzlI9OqjR3Wcy8YOEBKLFJC /3ENVJEMdHKXLAMHuPjtepcj8nkqnj0OZrmWG6X8D/xAzEBd+Cq2CzaExH4UiWePMTl+mwvxrOf 1L6LYVWmJr/CV1wsXEYgN52NTm0HaucWwgsVI23bORsm/Irbhl6Hc5ztJMB+ON0uoIoEO6nUZZU dAiKNUmQr9u7cZjf4HYCi0uWxPpSPZHOBUK8D4+mHSm9ldwkDbMJVrwbjEJ6T5yDbbfPuwrfXRl wW60DoQxwpKDlsBRmPoWLLugV02EjZaDJX97Y5/5aPmcv5dzL7egZSMVbBvGDEcOCTHiMKgP+Co iEatJV/JiGHumKW+p05c1AM3TjIVePXkm2w56ePxTDM6341JyWh88SfpV1g5Opr/3VmOO6IYYi0 aaSmAaSq7QklohpV18/nB96tjzah3PU+WoQmeg1pY9K+Ae6cOfbdF8uLlsd2VKUDGchhueNZtFP 9PQVbEQL3w== X-Received: by 2002:a17:90b:3909:b0:39e:359f:8539 with SMTP id 98e67ed59e1d1-39e54f35cf7mr19843880a91.15.1789964715138; Sun, 20 Sep 2026 21:25:15 -0700 (PDT) Received: from phui-2.c.googlers.com.com (78.123.83.34.bc.googleusercontent.com. [34.83.123.78]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39e6c5b3932sm11742139a91.13.2026.09.20.21.25.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Sep 2026 21:25:14 -0700 (PDT) From: Hui Peng To: Damien Le Moal , Christian Brauner , Jan Kara , Jeff Layton Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Hui Peng Subject: [PATCH v2 5/6] qnx6: abort mount on superblock magic mismatch when silent is set Date: Mon, 21 Sep 2026 04:25:10 +0000 Message-ID: <20260921042511.1473629-5-benquike@gmail.com> X-Mailer: git-send-email 2.55.0.1082.g2b9226bbc0-goog In-Reply-To: <20260921042511.1473629-1-benquike@gmail.com> References: <20260919222556.3792829-1-benquike@gmail.com> <20260921042511.1473629-1-benquike@gmail.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In qnx6_mmi_fill_super(), when the superblock #1 magic check fails and the silent mount flag (SB_SILENT) is set, the goto out statement is inside the if (!silent) block, so execution continues past the magic check with an invalid superblock (unlike superblock #2 at line 93 where goto out is outside if (!silent)). Move goto out outside the if (!silent) block. Tested in QEMU against Linux 7.3.0-rc3 by mounting a crafted QNX6 mmi_fs image on /dev/loop0 with sb1->sb_magic = 0xdeadbeef (!= QNX6_SUPER_MAGIC) using MS_SILENT | MS_RDONLY and "-o mmi_fs": on the unfixed kernel qnx6_mmi_fill_super() ignores the magic mismatch when MS_SILENT is set, logs "qnx6: superblock #1 active", and mounts the invalid-magic filesystem (mount returns 0), whereas on the fixed kernel qnx6_mmi_fill_super() immediately aborts at the magic check and rejects the mount with -EINVAL. Fixes: 5d026c724220 ("fs: initial qnx6fs addition") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Hui Peng --- Changes in v2: - Split the qnx6_mmi_fill_super() silent magic check fix into its own patch (5/6) and remove Markdown formatting from the commit message, as requested by Damien Le Moal. fs/qnx6/super_mmi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/qnx6/super_mmi.c b/fs/qnx6/super_mmi.c index b8afb6f388b2..18298e273a13 100644 --- a/fs/qnx6/super_mmi.c +++ b/fs/qnx6/super_mmi.c @@ -51,10 +51,9 @@ struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s, int silent) sb1 = (struct qnx6_mmi_super_block *)bh1->b_data; sbi = QNX6_SB(s); if (fs32_to_cpu(sbi, sb1->sb_magic) != QNX6_SUPER_MAGIC) { - if (!silent) { + if (!silent) pr_err("wrong signature (magic) in superblock #1.\n"); - goto out; - } + goto out; } /* checksum check - start at byte 8 and end at byte 512 */ -- 2.49.0