Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 659226eb authored by Dan Carpenter's avatar Dan Carpenter Committed by Jens Axboe
Browse files

lightnvm: don't print a warning for ADDR_EMPTY 



Reading from ADDR_EMPTY is out of bounds.  The current code generates a
static checker warning because we check for out of bounds "lba" before
we check for ADDR_EMPTY, so the second check is always false.  It looks
like we intended ADDR_EMPTY to be a no-op without printing a warning.

Fixes: a4bd217b ("lightnvm: physical block device (pblk) target")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 5bf1e1ee

drivers/lightnvm/pblk-read.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -410,15 +410,15 @@ static int read_rq_gc(struct pblk *pblk, struct nvm_rq *rqd, 
	struct ppa_addr ppa;

	struct ppa_addr ppa;

	int valid_secs = 0;

	int valid_secs = 0;





	if (lba == ADDR_EMPTY)

		goto out;



	/* logic error: lba out-of-bounds */

	/* logic error: lba out-of-bounds */

	if (lba >= pblk->rl.nr_secs) {

	if (lba >= pblk->rl.nr_secs) {

		WARN(1, "pblk: read lba out of bounds\n");

		WARN(1, "pblk: read lba out of bounds\n");

		goto out;

		goto out;

	}

	}





	if (lba == ADDR_EMPTY)

		goto out;



	spin_lock(&pblk->trans_lock);

	spin_lock(&pblk->trans_lock);

	ppa = pblk_trans_map_get(pblk, lba);

	ppa = pblk_trans_map_get(pblk, lba);

	spin_unlock(&pblk->trans_lock);

	spin_unlock(&pblk->trans_lock);