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

Commit df1c7bab authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] iscsi: fix setting of pid from netlink skb 



NETLINK_CREDS's pid now returns 0, so I guess we are supposed to
be using NETLINK_CB. This changed while the patch to export the
pid was getting merged upstream, so it was not noticed until both
the network and iscsi changes were in the same tree.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Cc: stable@kernel.org
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 46a7c17d

drivers/scsi/scsi_transport_iscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -1941,7 +1941,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) 
	switch (nlh->nlmsg_type) {

	case ISCSI_UEVENT_CREATE_SESSION:

		err = iscsi_if_create_session(priv, ep, ev,

					      NETLINK_CREDS(skb)->pid,

					      NETLINK_CB(skb).pid,

					      ev->u.c_session.initial_cmdsn,

					      ev->u.c_session.cmds_max,

					      ev->u.c_session.queue_depth);
@@ -1954,7 +1954,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) 
		}



		err = iscsi_if_create_session(priv, ep, ev,

					NETLINK_CREDS(skb)->pid,

					NETLINK_CB(skb).pid,

					ev->u.c_bound_session.initial_cmdsn,

					ev->u.c_bound_session.cmds_max,

					ev->u.c_bound_session.queue_depth);