mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Keith Busch <kbusch@kernel.org>
To: liuxixin <gliuxen@gmail.com>
Cc: linux-nvme@lists.infradead.org, axboe@kernel.dk, hch@lst.de,
	sagi@grimberg.me, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4 2/2] nvme: validate FDP configuration descriptor sizes
Date: Tue, 2 Jun 2026 13:19:16 +0100	[thread overview]
Message-ID: <ah7KRIl3LNsbWLO4@kbusch-mbp> (raw)
In-Reply-To: <b2f3e4d5c6b7a8901bcdef2345678901bcdef234.1748418000.git.gliuxen@gmail.com>

On Thu, May 28, 2026 at 06:00:02PM +0800, liuxixin wrote:
> @@ -2275,7 +2275,15 @@ static int nvme_query_fdp_granularity(struct nvme_ctrl *ctrl,
>  	desc = log;
>  	end = log + size - sizeof(*h);
>  	for (i = 0; i < fdp_idx; i++) {
> -		log += le16_to_cpu(desc->dsze);
> +		u16 dsze = le16_to_cpu(desc->dsze);
> +
> +		if (!dsze || log + dsze > end) {
> +			dev_warn(ctrl->device,
> +				 "FDP invalid config descriptor at index %d\n", i);
> +			ret = 0;
> +			goto out;
> +		}
> +		log += dsze;
>  		desc = log;
>  		if (log >= end) {
>  			dev_warn(ctrl->device,

I think you can delete this "log >= end" check now that you added the
same check right above.

  reply	other threads:[~2026-06-02 12:19 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-26  7:52 [PATCH v1 1/1] nvme: fix FDP configuration log parsing liuxixin
2026-05-26 14:41 ` Keith Busch
2026-05-27  2:22   ` [PATCH v2 0/1] " liuxixin
2026-05-27  2:29     ` [PATCH v2 1/1] " liuxixin
     [not found]       ` <CGME20260527090026epcas5p301bb017af42ab37a1e69e50b30df387e@epcas5p3.samsung.com>
2026-05-27  8:53         ` Nitesh Shetty
2026-05-27 13:32       ` Christoph Hellwig
2026-05-28  1:01         ` [PATCH v3 0/2] " liuxixin
2026-05-28  1:43           ` [PATCH v3 1/2] nvme: fix FDP fdpcidx bounds check liuxixin
2026-05-28  8:30             ` Christoph Hellwig
2026-05-28  1:43           ` [PATCH v3 2/2] nvme: validate FDP configuration descriptor sizes liuxixin
2026-05-28  8:30             ` Christoph Hellwig
2026-05-28 10:00               ` [PATCH v4 0/2] nvme: fix FDP configuration log parsing liuxixin
2026-05-28 10:00                 ` [PATCH v4 1/2] nvme: fix FDP fdpcidx bounds check liuxixin
2026-06-02 12:27                   ` Keith Busch
2026-05-28 10:00                 ` [PATCH v4 2/2] nvme: validate FDP configuration descriptor sizes liuxixin
2026-06-02 12:19                   ` Keith Busch [this message]
2026-06-02 14:00                     ` [PATCH v5 0/1] " liuxixin
2026-06-02 14:00                       ` [PATCH v5 1/1] " liuxixin
2026-06-03  9:42                         ` Keith Busch

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ah7KRIl3LNsbWLO4@kbusch-mbp \
    --to=kbusch@kernel.org \
    --cc=axboe@kernel.dk \
    --cc=gliuxen@gmail.com \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=sagi@grimberg.me \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome