Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / scsi / scsi_transport_iscsi.c

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 34c1860a259d8ac5ea458db279e263c13ed0deed..5428d15f23c617d5bfc579baea6391664c1c47c4 100644 (file)
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -1097,61 +1097,49 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 }
 
 /*
- * Get message from skb (based on rtnetlink_rcv_skb).  Each message is
- * processed by iscsi_if_recv_msg.  Malformed skbs with wrong lengths or
- * invalid creds are discarded silently.
+ * Get message from skb.  Each message is processed by iscsi_if_recv_msg.
+ * Malformed skbs with wrong lengths or invalid creds are not processed.
  */
 static void
-iscsi_if_rx(struct sock *sk, int len)
+iscsi_if_rx(struct sk_buff *skb)
 {
-       struct sk_buff *skb;
-
        mutex_lock(&rx_queue_mutex);
-       while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
-               if (NETLINK_CREDS(skb)->uid) {
-                       skb_pull(skb, skb->len);
-                       goto free_skb;
+       while (skb->len >= NLMSG_SPACE(0)) {
+               int err;
+               uint32_t rlen;
+               struct nlmsghdr *nlh;
+               struct iscsi_uevent *ev;
+
+               nlh = nlmsg_hdr(skb);
+               if (nlh->nlmsg_len < sizeof(*nlh) ||
+                   skb->len < nlh->nlmsg_len) {
+                       break;
                }
 
-               while (skb->len >= NLMSG_SPACE(0)) {
-                       int err;
-                       uint32_t rlen;
-                       struct nlmsghdr *nlh;
-                       struct iscsi_uevent *ev;
+               ev = NLMSG_DATA(nlh);
+               rlen = NLMSG_ALIGN(nlh->nlmsg_len);
+               if (rlen > skb->len)
+                       rlen = skb->len;
 
-                       nlh = nlmsg_hdr(skb);
-                       if (nlh->nlmsg_len < sizeof(*nlh) ||
-                           skb->len < nlh->nlmsg_len) {
-                               break;
-                       }
-
-                       ev = NLMSG_DATA(nlh);
-                       rlen = NLMSG_ALIGN(nlh->nlmsg_len);
-                       if (rlen > skb->len)
-                               rlen = skb->len;
-
-                       err = iscsi_if_recv_msg(skb, nlh);
-                       if (err) {
-                               ev->type = ISCSI_KEVENT_IF_ERROR;
-                               ev->iferror = err;
-                       }
-                       do {
-                               /*
-                                * special case for GET_STATS:
-                                * on success - sending reply and stats from
-                                * inside of if_recv_msg(),
-                                * on error - fall through.
-                                */
-                               if (ev->type == ISCSI_UEVENT_GET_STATS && !err)
-                                       break;
-                               err = iscsi_if_send_reply(
-                                       NETLINK_CREDS(skb)->pid, nlh->nlmsg_seq,
-                                       nlh->nlmsg_type, 0, 0, ev, sizeof(*ev));
-                       } while (err < 0 && err != -ECONNREFUSED);
-                       skb_pull(skb, rlen);
+               err = iscsi_if_recv_msg(skb, nlh);
+               if (err) {
+                       ev->type = ISCSI_KEVENT_IF_ERROR;
+                       ev->iferror = err;
                }
-free_skb:
-               kfree_skb(skb);
+               do {
+                       /*
+                        * special case for GET_STATS:
+                        * on success - sending reply and stats from
+                        * inside of if_recv_msg(),
+                        * on error - fall through.
+                        */
+                       if (ev->type == ISCSI_UEVENT_GET_STATS && !err)
+                               break;
+                       err = iscsi_if_send_reply(
+                               NETLINK_CREDS(skb)->pid, nlh->nlmsg_seq,
+                               nlh->nlmsg_type, 0, 0, ev, sizeof(*ev));
+               } while (err < 0 && err != -ECONNREFUSED);
+               skb_pull(skb, rlen);
        }
        mutex_unlock(&rx_queue_mutex);
 }
@@ -1523,7 +1511,7 @@ static __init int iscsi_transport_init(void)
        if (err)
                goto unregister_conn_class;
 
-       nls = netlink_kernel_create(NETLINK_ISCSI, 1, iscsi_if_rx, NULL,
+       nls = netlink_kernel_create(&init_net, NETLINK_ISCSI, 1, iscsi_if_rx, NULL,
                        THIS_MODULE);
        if (!nls) {
                err = -ENOBUFS;