From nobody Sat Apr 4 03:19:57 2026 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 842F728980F for ; Fri, 20 Mar 2026 15:52:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774021967; cv=none; b=HATY2zirqIk4m4rvegBjOsvrl7Iy02UZ1pUBIZWsh1l0rHVyC4wqJc2GLqeF7LcpKBndDIm3xJC9lhgfmCrK/G4BrPkXcUrurDgjDyEbxfAfeiE6xEDjRnvr+cC/OKoEQF0UG/uuHULgQoGDmDR5knFlFciIHuRChwdq/wn848M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774021967; c=relaxed/simple; bh=sS6PS4PllVmC9sKI7kZjrsMPU548t/KVd5b1vNIuYpw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t+LHHdUzn+vAYDBKmbQQcrGAGCTml+IML3r5SPLU3KHqT/5h53IUYJN9PXrZVLXKqaQ+g+YT5Ykgfl5VEveKcMdbIDxsF/3sRbO2jKDA7gIyMeuW5Q5UvfbR6jL4X/ifA2KsSgoVNBaehndAQXkUky4VvIFS2J3hQBa+gN5wyP8= 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=HB/4m+xv; arc=none smtp.client-ip=209.85.214.169 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="HB/4m+xv" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2aecc6b0861so12375345ad.2 for ; Fri, 20 Mar 2026 08:52:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774021965; x=1774626765; 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; bh=5NqVsX+/LV1zH4kDIO81wh1PQ5RAVeugSioQrUGNJdQ=; b=HB/4m+xvKucAGm/jwiNX4Dvc5GOft8tFRPD1/0zpISuOMbSP2TjzftpV0V8y6cQtqV XzRdI5oVv0y5Uy773NqHWZFO3YyTH7N/t0+zzCMv5yY4vgxSPpD9srWPE3DmE4Qai737 D0TtA97aU4Q+5u2mf0yH4SfgQECBv2wgNjH3eGmRbBdTCavPfoBa7tc4fvTImTMV/VPN RphqD1nL3b7aNN44qZ+yiz8TbKqAjfyYpSuYldIiP3w3m0Ssa+2Akx7Cgt+yZE+CgUuv rI2KXLrCXdDOkZuM0oxbXOxS8mzU5201/Yhbpq8JBv6BVHknP5Adu3M4FlTWTPhgKwLI XGiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774021965; x=1774626765; 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; bh=5NqVsX+/LV1zH4kDIO81wh1PQ5RAVeugSioQrUGNJdQ=; b=PZS6y7F3ViDTghmHps/GImjXG6Qe/0lHWlNhDibrvNi3a2bTc6o597JTtZWrxmeSMg BJfW1ZkIbdobwLF1nfzBf6DKnUCXVBy0p0mQTrDsKXNJ6xY+QXloxh2Urs4fllYgMVqj BcUeUr0nVyJF/NGa5U+HEV29G1tdMIBrNLpzDvEYcFt06S93eCqfXFaWBPn72elCxQec rvVeGmHFvzp3qk/iwz6Cpv5uESqv+by5LFxtK8Qh0VvsdsmWY8UeygiWJu8m7A8hSt3g hXhRK/mNsnesQoWwb15t0R2YWuQlMWyPyLSaXjdMo+PdBu/8YLuM3I5X/RXMmwxf+/5b rTJw== X-Forwarded-Encrypted: i=1; AJvYcCWNK/EMnbK0vJqi5g48oqoIPj63rhrNz6Q0qkeDPGyhpKMutlW1hnGIToRdI/LBAurOn/2IoqUefrKuIu0=@vger.kernel.org X-Gm-Message-State: AOJu0YzH/cwbs9El7EErgV4aTTaXvKInE7GGmqhfh7ktZzIz7AfZC8tI Gd+Wd5FY/J2jbNTv4mz+50a/3qyVUF0PamxaurqRKSivbcJ9g/H7pw59 X-Gm-Gg: ATEYQzz7vbKP8IV3/DWn8n89owl8uaLEwpAcWyRntaCL8v3K6G4P3xEy1OLni/pXIO/ s4aYCrdSZORw2sCT6BqmHer4qv/BsL0MhREJmRo9EWtB+SfL4gzLZRrcU4Q2aMRYkl4bi/twUyw Chjb6QNRrPj2Z+/TZmhFlmwuepSShVyljvH9ndPi3SNqqowOWxWoPyBo1uwMkpskTRc8OR4plrE kIgSPmOg3RWJS6Kl5sRa3M7xT31rjmfkzbYK5jHznT/Jbpav8xJM7Hx/S0HIgcQbhWQnp87tg2+ Dp2YYYGhlXmdD04oeGy/ye62jMsOHpcsuRjv3m55igoRqviy8Mwjp8BzAu6PJYjJ1aqSmRRN/7r Hmhtuzny+aE/ciA15pvKh5UujLNZFI0lMLA2voET3hKVPK8DEFdCB8AguTq4RwZk13O7xhhnFMW z18nHIEZhjSKKsnUr/gjHY0ILe X-Received: by 2002:a17:902:e84b:b0:2ae:c7dc:95a4 with SMTP id d9443c01a7336-2b0827749f5mr32346035ad.20.1774021964810; Fri, 20 Mar 2026 08:52:44 -0700 (PDT) Received: from paeyz.Davolink ([49.172.60.165]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b083516b96sm35798065ad.7.2026.03.20.08.52.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 08:52:44 -0700 (PDT) From: paeyz To: Russell King , gregkh@linuxfoundation.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, stable@kernel.org, Kees Cook , Al Viro Subject: [PATCH v2] adfs: validate nzones in adfs_validate_bblk() Date: Sat, 21 Mar 2026 00:52:13 +0900 Message-ID: <20260320155213.2812-1-iwasbaeyz@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <2026032039-agility-ferocity-6ee0@gregkh> References: <2026032039-agility-ferocity-6ee0@gregkh> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Bae Yeonju Reject ADFS disc records with a zero zone count during boot block validation, before the disc record is used. When nzones is 0, adfs_read_map() passes it to kmalloc_array(0, ...) which returns ZERO_SIZE_PTR, and adfs_map_layout() then writes to dm[-1], causing an out-of-bounds write before the allocated buffer. adfs_validate_dr0() already rejects nzones !=3D 1 for old-format images. Add the equivalent check to adfs_validate_bblk() for new-format images so that a crafted image with nzones =3D=3D 0 is rejected at probe time. Found by syzkaller. Fixes: f6f14a0d71b0 ("fs/adfs: map: move map-specific sb initialisation to = map.c") Tested-by: Bae Yeonju Signed-off-by: Bae Yeonju Acked-by: Greg Kroah-Hartman --- fs/adfs/super.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/adfs/super.c b/fs/adfs/super.c index 4d3015e3a..b5522b862 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c @@ -343,6 +343,9 @@ static int adfs_validate_bblk(struct super_block *sb, s= truct buffer_head *bh, if (adfs_checkdiscrecord(dr)) return -EILSEQ; + if ((dr->nzones | dr->nzones_high << 8) =3D=3D 0) + return -EILSEQ; + *drp =3D dr; return 0; } -- 2.43.0