Commit 7cd49f75 authored Aug 24, 2020 by Sagi Grimberg

nvme: Fix NULL dereference for pci nvme controllers



PCIe controllers do not have fabric opts, verify they exist before
showing ctrl_loss_tmo or reconnect_delay attributes.

Fixes: 764075fd ("nvme: expose reconnect_delay and ctrl_loss_tmo via sysfs")
Reported-by: Tobias Markus <tobias@markus-regensburg.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>

parent 2362acb6

drivers/nvme/host/core.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -3676,6 +3676,10 @@ static umode_t nvme_dev_attrs_are_visible(struct kobject *kobj,
		return 0;
		if (a == &dev_attr_hostid.attr && !ctrl->opts)
		return 0;
		if (a == &dev_attr_ctrl_loss_tmo.attr && !ctrl->opts)
		return 0;
		if (a == &dev_attr_reconnect_delay.attr && !ctrl->opts)
		return 0;

		return a->mode;
		}

Admin message