Commit 1ed498a2 authored by Keith Busch's avatar Keith Busch Committed by sanglipeng
Browse files

nvme: restrict management ioctls to admin 

stable inclusion
from stable-v5.10.156
commit b9a5ecf24180f36bab967b4b1dbb112a0fa37255
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7MCG1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b9a5ecf24180f36bab967b4b1dbb112a0fa37255



--------------------------------

commit 23e085b2 upstream.

The passthrough commands already have this restriction, but the other
operations do not. Require the same capabilities for all users as all of
these operations, which include resets and rescans, can be disruptive.

Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarOvidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent cf7159d6

drivers/nvme/host/core.c

+6 −0
Original line number Diff line number Diff line
@@ -3293,11 +3293,17 @@ static long nvme_dev_ioctl(struct file *file, unsigned int cmd, 
	case NVME_IOCTL_IO_CMD:

		return nvme_dev_user_cmd(ctrl, argp);

	case NVME_IOCTL_RESET:

		if (!capable(CAP_SYS_ADMIN))

			return -EACCES;

		dev_warn(ctrl->device, "resetting controller\n");

		return nvme_reset_ctrl_sync(ctrl);

	case NVME_IOCTL_SUBSYS_RESET:

		if (!capable(CAP_SYS_ADMIN))

			return -EACCES;

		return nvme_reset_subsystem(ctrl);

	case NVME_IOCTL_RESCAN:

		if (!capable(CAP_SYS_ADMIN))

			return -EACCES;

		nvme_queue_scan(ctrl);

		return 0;

	default: