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

Commit 1b1031ca authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: validate cntlid during controller initialisation 



The CNTLID value is required to be unique, and we do rely on this
for correct operation. So reject any controller for which a non-unique
CNTLID has been detected.

Based on a patch from Hannes Reinecke.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
parent 32fd90c4

drivers/nvme/host/core.c

+24 −17
Original line number Diff line number Diff line
@@ -2341,20 +2341,35 @@ static const struct attribute_group *nvme_subsys_attrs_groups[] = { 
	NULL,

};



static int nvme_active_ctrls(struct nvme_subsystem *subsys)

static bool nvme_validate_cntlid(struct nvme_subsystem *subsys,

		struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)

{

	int count = 0;

	struct nvme_ctrl *ctrl;

	struct nvme_ctrl *tmp;



	lockdep_assert_held(&nvme_subsystems_lock);



	list_for_each_entry(ctrl, &subsys->ctrls, subsys_entry) {

		if (ctrl->state != NVME_CTRL_DELETING &&

		    ctrl->state != NVME_CTRL_DEAD)

			count++;

	list_for_each_entry(tmp, &subsys->ctrls, subsys_entry) {

		if (ctrl->state == NVME_CTRL_DELETING ||

		    ctrl->state == NVME_CTRL_DEAD)

			continue;



		if (tmp->cntlid == ctrl->cntlid) {

			dev_err(ctrl->device,

				"Duplicate cntlid %u with %s, rejecting\n",

				ctrl->cntlid, dev_name(tmp->device));

			return false;

		}



	return count;

		if ((id->cmic & (1 << 1)) ||

		    (ctrl->opts && ctrl->opts->discovery_nqn))

			continue;



		dev_err(ctrl->device,

			"Subsystem does not support multiple controllers\n");

		return false;

	}



	return true;

}



static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
@@ -2397,15 +2412,7 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) 
		__nvme_release_subsystem(subsys);

		subsys = found;



		/*

		 * Verify that the subsystem actually supports multiple

		 * controllers, else bail out.

		 */

		if (!(ctrl->opts && ctrl->opts->discovery_nqn) &&

		    nvme_active_ctrls(found) && !(id->cmic & (1 << 1))) {

			dev_err(ctrl->device,

				"ignoring ctrl due to duplicate subnqn (%s).\n",

				subsys->subnqn);

		if (!nvme_validate_cntlid(subsys, ctrl, id)) {

			ret = -EINVAL;

			goto out_put_subsystem;

		}