Skip to content

Commit

Permalink
[SCSI] iscsi update: pass correct skb to skb_trim
Browse files Browse the repository at this point in the history
>From da-x@monatomic.org:

Wrong skb is passed to skb_trim in iscsi_if_get_stats.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Alex Aizman <itn780@yahoo.com>
Signed-off-by: Dmitry Yusupov <dmitry_yus@yahoo.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
  • Loading branch information
Mike Christie authored and Unknown committed Feb 4, 2006
1 parent 7b7232f commit 5b940ad
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/scsi/scsi_transport_iscsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -680,8 +680,7 @@ iscsi_if_send_reply(int pid, int seq, int type, int done, int multi,
}

static int
iscsi_if_get_stats(struct iscsi_transport *transport, struct sk_buff *skb,
struct nlmsghdr *nlh)
iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
{
struct iscsi_uevent *ev = NLMSG_DATA(nlh);
struct iscsi_stats *stats;
Expand Down Expand Up @@ -732,7 +731,7 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct sk_buff *skb,
stats->custom_length);
actual_size -= sizeof(*nlhstat);
actual_size = NLMSG_LENGTH(actual_size);
skb_trim(skb, NLMSG_ALIGN(actual_size));
skb_trim(skbstat, NLMSG_ALIGN(actual_size));
nlhstat->nlmsg_len = actual_size;

err = iscsi_unicast_skb(conn->z_pdu, skbstat);
Expand Down Expand Up @@ -923,7 +922,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
err = -EINVAL;
break;
case ISCSI_UEVENT_GET_STATS:
err = iscsi_if_get_stats(transport, skb, nlh);
err = iscsi_if_get_stats(transport, nlh);
break;
default:
err = -EINVAL;
Expand Down

0 comments on commit 5b940ad

Please sign in to comment.