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

Commit 6dde1d6c authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe
Browse files

lightnvm: check overflow and correct mlc pairs 



The specification currently limits the number of MLC pairs to 886. Make
sure that a device is unable to be instantiate if more is configured.

Also, previously the patch had the wrong math for copying MLC pairs, as
it only copied half of the actual entries.

Fixes: ca5927e7 "lightnvm: introduce mlc lower page table mappings"
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 3704e098

drivers/nvme/host/lightnvm.c

+9 −3
Original line number Diff line number Diff line
@@ -146,9 +146,10 @@ struct nvme_nvm_command { 
	};

};



#define NVME_NVM_LP_MLC_PAIRS 886

struct nvme_nvm_lp_mlc {

	__u16			num_pairs;

	__u8			pairs[886];

	__u8			pairs[NVME_NVM_LP_MLC_PAIRS];

};



struct nvme_nvm_lp_tbl {
@@ -282,9 +283,14 @@ static int init_grps(struct nvm_id *nvm_id, struct nvme_nvm_id *nvme_nvm_id) 
			memcpy(dst->lptbl.id, src->lptbl.id, 8);

			dst->lptbl.mlc.num_pairs =

					le16_to_cpu(src->lptbl.mlc.num_pairs);

			/* 4 bits per pair */



			if (dst->lptbl.mlc.num_pairs > NVME_NVM_LP_MLC_PAIRS) {

				pr_err("nvm: number of MLC pairs not supported\n");

				return -EINVAL;

			}



			memcpy(dst->lptbl.mlc.pairs, src->lptbl.mlc.pairs,

						dst->lptbl.mlc.num_pairs >> 1);

						dst->lptbl.mlc.num_pairs);

		}

	}