mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 00:40:03 +00:00
[SCSI] iscsi update: pass correct skb to skb_trim
>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>
This commit is contained in:
parent
7b7232f3fb
commit
5b940adf5b
1 changed files with 3 additions and 4 deletions
|
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue