From nobody Sat Apr 4 01:48:48 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 3477018859B for ; Sat, 21 Mar 2026 04:45:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774068335; cv=none; b=IIT0rASQUantOyVgzPaVUfxpMoJDFK0Lg5MBQiuUJPIiYDhPe9va8xE88YZjBQUQiMi3+M8TrM3PoVcVOt1WTYDahEhXoIYhqE+dCbWIScDa4ZpvAjVpHnnx25z+L1rWSYSiXNo4/HTyjTBqEILS7WBRJfRFkp5kMsqAxia1wgY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774068335; c=relaxed/simple; bh=l9uZtlPLb41kctCnjLr4AzYtVimH6eYU8R7RNcvCnYU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pZpb5IGVYr+TBzJi7GsPAvRyFTYTN0fIKE85mYdTb3MJfOh/XJXEudTlMXCLWErtDQbesDfNomrfdz/jW9EkdvNlsBfjQMH7xRsSXXBrqo8MsAg/lENvOOetQxoEFWqaRe3a5bNaqnu9eXhlbCTIlqV+6+XowW8dUp+5zA5iTZM= 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=dDTCuf5U; arc=none smtp.client-ip=209.85.214.180 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="dDTCuf5U" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2adff872068so5642615ad.1 for ; Fri, 20 Mar 2026 21:45:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774068333; x=1774673133; 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=o2LlKYUAtiABOZvAUle20IIBf1OJJzxfLipXWlkNmow=; b=dDTCuf5UTdymuZpLn8KPyLQy2LrmrrFdL+0HJ+XqmwCVm871rtDv5WIL38w0DGoar0 yjIoy/2mEtV0CPxM6EX6LKtib4yt9SPefN86mR/mtbqnFxEpX8B5VHn2RfroovkIRY6X 5M4L9wojyH1zYdR4g9e5AyF6jjI6j77o/WqEj6DdY0rPQwzwD9+uOubeAGSqw2kRD60B 3fgM2r0etqh4Xw9cJfSjNj6yngP3aBmI00FA7VWJMs9LE4SEc4N1frtbP3jhJX47yBuo rbdsGVIlkmDcTfArWwg19RODLBPV9KYqBy5M3B5rR+vSSEhA/n1m8RiPx1tLkqOrocVs mdVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774068333; x=1774673133; 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=o2LlKYUAtiABOZvAUle20IIBf1OJJzxfLipXWlkNmow=; b=AXGYiWGMOPgXC9PWUyszCWrsXejW6UW4caDQTi3BJCkslxMg+I08MexoW2g8PpYJFZ vyYA3wqJXMzUzbuYR6iRKeJ4oq2RGEYkIuwZ1xXB+kA5CSguLQrXQS/jM2yaE5yxUt7W emJUhAu6MXPJ0RFkvsPVF4l5mw+awkmn20n/sazTqeJDE3H8OtKnHgYv364m0ptQUiVY EU2Xrnfm0IPyrT6PkYi7bv23uWnZ4Va+IFaK09GnvVMhu9BSJ6HhEuspMTHc8xf7hIO9 sQbOjUhvYe+3gM0WNQrzGlMmvx2rp/mpMJN9gARApGvjYE19ZbfXnsNVJ/ScRPsimOKb lRog== X-Forwarded-Encrypted: i=1; AJvYcCUMdz2CZCsdF+PJ+Lr1Lmd1W8R+5XAHmQ55Gbv0eKIOHacZuO+M/MN+vYtoAUgEpfg3220jAGLVww1TFKc=@vger.kernel.org X-Gm-Message-State: AOJu0YyDC8uatN/X4Y6vCE839p07C2khgdc6RJEN+kU7MCj1XkU4nGcW cqvZZk7sodOCO7n/jbZtbcPbCsaR7qV4w1o0kCy7nJsLFQRJgnruZHMRWTqiAAVK X-Gm-Gg: ATEYQzxhf82MlNjo7mTiYYJRLwjTtNp6XskHRLlJU7uI8y+D5kpQcoyFclyj7r+9Jz2 n4RZpxMZUNfzla6AQBJ0LdHI+scdTErpwZnYlMTW+BuZDer/U2bjJDq2KYjvjZG1826JUwYasJq clhLVQplLI64WdaiWeZw8LM9vT6Erv8pT0v3CMXtxjGSjbeq8dCvRMgBVKWWznAo6FAB92Labai LukCmcb327SIDT3MxQRHb+K9nuhdD+dGxvRq7AuTUBq0tFSdvXFSTRj7U8AIM5GV080jejsUdL+ JrrZ0XdI7l5PLu7ksKnBvhx2b9t/ci1NwHJNQr9JOCEo2TuLFQcRgp1E6TK/zkr3Fd4m8X1rHdZ RehNikVqJ/xKXVwRh7qNpmji86CuvqYL7P+VvxRCGw11PoHzUJGEGW7C4ToRAdL8RgH4MXsdLC+ pwclvY9fyPVEjjuu1fG4uKmBmZ X-Received: by 2002:a17:902:dac7:b0:2a4:8cd:c3cf with SMTP id d9443c01a7336-2b0827f0290mr50326555ad.49.1774068333457; Fri, 20 Mar 2026 21:45:33 -0700 (PDT) Received: from paeyz.Davolink ([49.172.60.165]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b0836554a1sm38761765ad.53.2026.03.20.21.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 21:45:33 -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 v3] adfs: validate nzones in adfs_validate_bblk() Date: Sat, 21 Mar 2026 13:45:02 +0900 Message-ID: <20260321044502.2988-1-iwasbaeyz@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <2026032025-mouse-gestation-876a@gregkh> References: <2026032025-mouse-gestation-876a@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") Signed-off-by: Bae Yeonju --- Changes in v3: - Drop redundant Tested-by Changes in v2: - Move check from adfs_read_map() to adfs_validate_bblk() (Russell King) 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