Commit 688e8128 authored by Lee Duncan's avatar Lee Duncan Committed by Martin K. Petersen
Browse files

scsi: iscsi: Restrict sessions and handles to admin capabilities 



Protect the iSCSI transport handle, available in sysfs, by requiring
CAP_SYS_ADMIN to read it. Also protect the netlink socket by restricting
reception of messages to ones sent with CAP_SYS_ADMIN. This disables
normal users from being able to end arbitrary iSCSI sessions.

Cc: stable@vger.kernel.org
Reported-by: default avatarAdam Nichols <adam@grimm-co.com>
Reviewed-by: default avatarChris Leech <cleech@redhat.com>
Reviewed-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarLee Duncan <lduncan@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f69d02e3

drivers/scsi/scsi_transport_iscsi.c

+6 −0
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ show_transport_handle(struct device *dev, struct device_attribute *attr, 
		      char *buf)

{

	struct iscsi_internal *priv = dev_to_iscsi_internal(dev);



	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;

	return sprintf(buf, "%llu\n", (unsigned long long)iscsi_handle(priv->iscsi_transport));

}

static DEVICE_ATTR(handle, S_IRUGO, show_transport_handle, NULL);
@@ -3621,6 +3624,9 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) 
	struct iscsi_cls_conn *conn;

	struct iscsi_endpoint *ep = NULL;



	if (!netlink_capable(skb, CAP_SYS_ADMIN))

		return -EPERM;



	if (nlh->nlmsg_type == ISCSI_UEVENT_PATH_UPDATE)

		*group = ISCSI_NL_GRP_UIP;

	else