From nobody Mon Jun 8 04:11:43 2026 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (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 B979F305685 for ; Wed, 3 Jun 2026 01:09:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780448945; cv=none; b=F0/wyN8R1qwOAAewOsnTdRcVWXHgLiotaV3/ppFUqlHYVBUccEj8HCL336/wznqISXpwsS2GLRpl4vx5k9pkVHgTivKuEvH1AdazEmkuK3ZPSEl52WCbjRdw7E8LEbNpJgvwEsBPVslCevY7RD4JCY6VXfTIlL6CiAY82coX6Vg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780448945; c=relaxed/simple; bh=04n/7fF69SmKTVBd6f4yk6980MYpn6MWRvS146nJ/rQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qZguhHVp294yvdk37JtT1oC80yVNNLfIhxksU5QIPkW+W+svCgQ+6hYo8Jdct71FbbSuXVSduJHdG5/5I96Y5fgtOn2VzLBJs+OHc2sCV03AKPPP0Zva9xeWlW8dRIcr/us8HfECqtdANiUaXp5/a602aaw6vpL5uBixJn9+ors= 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=jhcHNOx0; arc=none smtp.client-ip=209.85.215.171 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="jhcHNOx0" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-c858cc9870aso64877a12.0 for ; Tue, 02 Jun 2026 18:09:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780448944; x=1781053744; 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=UBUV0ZKl5dn5qAIbynC2sc0LbBigrU604bqLQhPbA6c=; b=jhcHNOx0hA2EVkdgFSJPEjFpO/p6Z5L+GHDLQ+M2c6JFKOby8NYDcNY9aiRtjb+vAk licOWeAmbuXABdS7qFS83bOdugBi7Tff1xGGUdwbHAyPOjBrHy4J0Ywu7Jon91bBPk6x ogyWK6r26mEDHo2iXy+GMHOn9285nDiYCEl1tiDVjvxYAQFf1zzkPHlMauY2AlPhWse3 uxDLPxHJ8IY+6QjIfPcAGukghB2QmlB+DfHdZyaFELC20IWm2cOH/EfwFHM6OXx3QZ1t J57FnJRZjTF/8iWbPK6Kxf4CJf39FR1zzNHHfUdOWACfWedgLRzrb2fGW8PyMCbYjFEf +Gxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780448944; x=1781053744; 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=UBUV0ZKl5dn5qAIbynC2sc0LbBigrU604bqLQhPbA6c=; b=PvhawuAs6MLXpZT+DZKlksCdzUdcnFukhtpg0cC/qQ8qfCeZPUs0onk1nvF1BVQDxy 8ZtmzqebjZqCXuvX08Lm0aMpvw/aJbyFqQEmtjetkG44qCgNK47jPxVxAoxMC/8o6Q+q oORegfNnNFCDZKWKJgt3khOXsdZkPU6d1e9nRu9sIeSVI1QBebdwi0/kFWhKnkV7qAM2 N2P5Gxzm3YnnFY22a48BtqZ/hEZG7uL+oBllYiiAD+2vtQJHBlqiajF0L4raa84BEdP1 ZOVV846P4s1WDrrmZbLBpZZxn6Y+pSfj1j5oQeXCU6XeVQVxQpHQF3sddubs/agf6fx2 XHaw== X-Forwarded-Encrypted: i=1; AFNElJ9bQN915uWIy8Etf/asEkPDxV1/na7eVmNkSGJqcISjCzAIXOz10ctSg7rutyEWmubcwoguMM/zJ9AhIxg=@vger.kernel.org X-Gm-Message-State: AOJu0YzpIJIwDaCSPz1TbWc7l6umEnmGxZ8DImqwaiCzWZYwSE9DToG2 /BU1Qqd91+xz5RSimNYVjHxj7jhaLfnbY/SSZnyD0RYQVMCsW6kPTtch X-Gm-Gg: Acq92OE4rXKHFUeIjSBnImkzy4x9VSVRVMV4S1LMw5be3hm6GMnt7EHuUuV3TIR/t0/ zsLYsyBcXQhkw4jCGEh8HF8ozyasc3182Fazh9N48qMyw0udRkxf4pw4lnd9HaxXUVGlzABtrS+ g08Rym1dRWQBRpHHQzrE42ByEKUc6H4SBn9Qx9pw6uomQcHIxsNnc9Ic54QxS3NDv/crzvyzNlZ c8I7U4Ve4PG9QKv1lFypI+urFujmoxaWV8VVRAUJxZRVbmgg12QhPLFV2HeyZhY6PTd03QjaoG7 RKEVclxw0kSgstwooHGHH2huAXShQOGI7iYeocZfdLZL6Y7bm/ohmLE6Zm1BwQCVIuj49f7pItM YeFUhdMmHNrffkzhB7d5UaGIcbROGRLb4L+wDfy2DMOeVdBIOGm1PYdvNHcqFAFzBmFfy95UsJT pGBEs8JGp5xPIMsRBMMwEg0CaxNGOx X-Received: by 2002:a17:903:2b10:b0:2b0:6068:4c5f with SMTP id d9443c01a7336-2c1645e77b0mr8896335ad.8.1780448943692; Tue, 02 Jun 2026 18:09:03 -0700 (PDT) Received: from [127.0.1.1] ([221.238.56.51]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c16609ed97sm5076825ad.41.2026.06.02.18.09.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 18:09:03 -0700 (PDT) From: liuxixin To: linux-nvme@lists.infradead.org Cc: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me, nj.shetty@samsung.com, linux-kernel@vger.kernel.org, gliuxen@gmail.com Subject: [PATCH v5 1/1] nvme: validate FDP configuration descriptor sizes Date: Tue, 2 Jun 2026 22:00:01 +0800 Message-ID: In-Reply-To: References: <20260527133205.GA12042@lst.de> 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 X-Mailer: send-local.py Content-Type: text/plain; charset="utf-8" Validate descriptor sizes while walking the FDP configurations log so dsze =3D=3D 0 or a descriptor past the log end cannot cause unbounded iteration or reads past the buffer. Reviewed-by: Nitesh Shetty Reviewed-by: Christoph Hellwig Signed-off-by: liuxixin --- drivers/nvme/host/core.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 766157ba6..48633a8bb 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2275,14 +2275,16 @@ static int nvme_query_fdp_granularity(struct nvme_c= trl *ctrl, desc =3D log; end =3D log + size - sizeof(*h); for (i =3D 0; i < fdp_idx; i++) { - log +=3D le16_to_cpu(desc->dsze); - desc =3D log; - if (log >=3D end) { + u16 dsze =3D le16_to_cpu(desc->dsze); + + if (!dsze || log + dsze > end) { dev_warn(ctrl->device, - "FDP invalid config descriptor list\n"); + "FDP invalid config descriptor at index %d\n", i); ret =3D 0; goto out; } + log +=3D dsze; + desc =3D log; } =20 if (le32_to_cpu(desc->nrg) > 1) { --=20 2.43.0