6 files changed, 53 insertions, 73 deletions

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 77d2d9ce8962..711ca4b1f051 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -1,8 +1,8 @@
 /*
  * net/tipc/eth_media.c: Ethernet bearer support for TIPC
  *
- * Copyright (c) 2001-2006, Ericsson AB
- * Copyright (c) 2005-2006, Wind River Systems
+ * Copyright (c) 2001-2007, Ericsson AB
+ * Copyright (c) 2005-2007, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -87,6 +87,9 @@ static int send_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr,
 /**
  * recv_msg - handle incoming TIPC message from an Ethernet interface
  *
+ * Accept only packets explicitly sent to this node, or broadcast packets;
+ * ignores packets sent using Ethernet multicast, and traffic sent to other
+ * nodes (which can happen if interface is running in promiscuous mode).
  * Routine truncates any Ethernet padding/CRC appended to the message,
  * and ensures message size matches actual length
  */
@@ -98,9 +101,7 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev,
         u32 size;
 
         if (likely(eb_ptr->bearer)) {
-               if (likely(!dev->promiscuity) ||
-                   !memcmp(skb_mac_header(buf), dev->dev_addr, ETH_ALEN) ||
-                   !memcmp(skb_mac_header(buf), dev->broadcast, ETH_ALEN)) {
+                if (likely(buf->pkt_type <= PACKET_BROADCAST)) {
                         size = msg_size((struct tipc_msg *)buf->data);
                         skb_trim(buf, size);
                         if (likely(buf->len == size)) {
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 2124f32ef29f..5adfdfd49d61 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1,8 +1,8 @@
 /*
  * net/tipc/link.c: TIPC link code
  *
- * Copyright (c) 1996-2006, Ericsson AB
- * Copyright (c) 2004-2006, Wind River Systems
+ * Copyright (c) 1996-2007, Ericsson AB
+ * Copyright (c) 2004-2007, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1260,7 +1260,7 @@ again:
          * (Must not hold any locks while building message.)
          */
 
-        res = msg_build(hdr, msg_sect, num_sect, sender->max_pkt,
+        res = msg_build(hdr, msg_sect, num_sect, sender->publ.max_pkt,
                         !sender->user_port, &buf);
 
         read_lock_bh(&tipc_net_lock);
@@ -1271,7 +1271,7 @@ again:
                 if (likely(l_ptr)) {
                         if (likely(buf)) {
                                 res = link_send_buf_fast(l_ptr, buf,
-                                                         &sender->max_pkt);
+                                                         &sender->publ.max_pkt);
                                 if (unlikely(res < 0))
                                         buf_discard(buf);
 exit:
@@ -1299,12 +1299,12 @@ exit:
                          * then re-try fast path or fragment the message
                          */
 
-                        sender->max_pkt = link_max_pkt(l_ptr);
+                        sender->publ.max_pkt = link_max_pkt(l_ptr);
                         tipc_node_unlock(node);
                         read_unlock_bh(&tipc_net_lock);
 
 
-                        if ((msg_hdr_sz(hdr) + res) <= sender->max_pkt)
+                        if ((msg_hdr_sz(hdr) + res) <= sender->publ.max_pkt)
                                 goto again;
 
                         return link_send_sections_long(sender, msg_sect,
@@ -1357,7 +1357,7 @@ static int link_send_sections_long(struct port *sender,
 
 again:
         fragm_no = 1;
-        max_pkt = sender->max_pkt - INT_H_SIZE;
+        max_pkt = sender->publ.max_pkt - INT_H_SIZE;
                 /* leave room for tunnel header in case of link changeover */
         fragm_sz = max_pkt - INT_H_SIZE;
                 /* leave room for fragmentation header in each fragment */
@@ -1463,7 +1463,7 @@ error:
                         goto reject;
                 }
                 if (link_max_pkt(l_ptr) < max_pkt) {
-                        sender->max_pkt = link_max_pkt(l_ptr);
+                        sender->publ.max_pkt = link_max_pkt(l_ptr);
                         tipc_node_unlock(node);
                         for (; buf_chain; buf_chain = buf) {
                                 buf = buf_chain->next;
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 9dfc9127acdd..d8473eefcd23 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -1052,12 +1052,11 @@ int tipc_nametbl_init(void)
 {
         int array_size = sizeof(struct hlist_head) * tipc_nametbl_size;
 
-        table.types = kmalloc(array_size, GFP_ATOMIC);
+        table.types = kzalloc(array_size, GFP_ATOMIC);
         if (!table.types)
                 return -ENOMEM;
 
         write_lock_bh(&tipc_nametbl_lock);
-        memset(table.types, 0, array_size);
         table.local_publ_count = 0;
         write_unlock_bh(&tipc_nametbl_lock);
         return 0;
diff --git a/net/tipc/port.c b/net/tipc/port.c
index bcd5da00737b..5d2b9ce84d0a 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -1,8 +1,8 @@
 /*
  * net/tipc/port.c: TIPC port code
  *
- * Copyright (c) 1992-2006, Ericsson AB
- * Copyright (c) 2004-2005, Wind River Systems
+ * Copyright (c) 1992-2007, Ericsson AB
+ * Copyright (c) 2004-2007, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -239,6 +239,8 @@ u32 tipc_createport_raw(void *usr_handle,
         }
 
         tipc_port_lock(ref);
+        p_ptr->publ.usr_handle = usr_handle;
+        p_ptr->publ.max_pkt = MAX_PKT_DEFAULT;
         p_ptr->publ.ref = ref;
         msg = &p_ptr->publ.phdr;
         msg_init(msg, DATA_LOW, TIPC_NAMED_MSG, TIPC_OK, LONG_H_SIZE, 0);
@@ -248,11 +250,9 @@ u32 tipc_createport_raw(void *usr_handle,
         msg_set_importance(msg,importance);
         p_ptr->last_in_seqno = 41;
         p_ptr->sent = 1;
-        p_ptr->publ.usr_handle = usr_handle;
         INIT_LIST_HEAD(&p_ptr->wait_list);
         INIT_LIST_HEAD(&p_ptr->subscription.nodesub_list);
         p_ptr->congested_link = NULL;
-        p_ptr->max_pkt = MAX_PKT_DEFAULT;
         p_ptr->dispatcher = dispatcher;
         p_ptr->wakeup = wakeup;
         p_ptr->user_port = NULL;
@@ -1243,7 +1243,7 @@ int tipc_connect2port(u32 ref, struct tipc_portid const *peer)
         res = TIPC_OK;
 exit:
         tipc_port_unlock(p_ptr);
-        p_ptr->max_pkt = tipc_link_get_max_pkt(peer->node, ref);
+        p_ptr->publ.max_pkt = tipc_link_get_max_pkt(peer->node, ref);
         return res;
 }
 
diff --git a/net/tipc/port.h b/net/tipc/port.h
index 7ef4d64b32f7..e5f8c16429bd 100644
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -1,8 +1,8 @@
 /*
  * net/tipc/port.h: Include file for TIPC port code
  *
- * Copyright (c) 1994-2006, Ericsson AB
- * Copyright (c) 2004-2005, Wind River Systems
+ * Copyright (c) 1994-2007, Ericsson AB
+ * Copyright (c) 2004-2007, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,7 +81,6 @@ struct user_port {
  * @acked:
  * @publications: list of publications for port
  * @pub_count: total # of publications port has made during its lifetime
- * @max_pkt: maximum packet size "hint" used when building messages sent by port
  * @probing_state:
  * @probing_interval:
  * @last_in_seqno:
@@ -102,7 +101,6 @@ struct port {
         u32 acked;
         struct list_head publications;
         u32 pub_count;
-        u32 max_pkt;
         u32 probing_state;
         u32 probing_interval;
         u32 last_in_seqno;
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 45832fb75ea4..84110172031e 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1,8 +1,8 @@
 /*
  * net/tipc/socket.c: TIPC socket API
  *
- * Copyright (c) 2001-2006, Ericsson AB
- * Copyright (c) 2004-2006, Wind River Systems
+ * Copyright (c) 2001-2007, Ericsson AB
+ * Copyright (c) 2004-2007, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -607,23 +607,24 @@ exit:
 static int send_stream(struct kiocb *iocb, struct socket *sock,
                        struct msghdr *m, size_t total_len)
 {
+        struct tipc_port *tport;
         struct msghdr my_msg;
         struct iovec my_iov;
         struct iovec *curr_iov;
         int curr_iovlen;
         char __user *curr_start;
+        u32 hdr_size;
         int curr_left;
         int bytes_to_send;
         int bytes_sent;
         int res;
 
-        if (likely(total_len <= TIPC_MAX_USER_MSG_SIZE))
-                return send_packet(iocb, sock, m, total_len);
-
-        /* Can only send large data streams if already connected */
+        /* Handle special cases where there is no connection */
 
         if (unlikely(sock->state != SS_CONNECTED)) {
-                if (sock->state == SS_DISCONNECTING)
+                if (sock->state == SS_UNCONNECTED)
+                        return send_packet(iocb, sock, m, total_len);
+                else if (sock->state == SS_DISCONNECTING)
                         return -EPIPE;
                 else
                         return -ENOTCONN;
@@ -648,17 +649,25 @@ static int send_stream(struct kiocb *iocb, struct socket *sock,
         my_msg.msg_name = NULL;
         bytes_sent = 0;
 
+        tport = tipc_sk(sock->sk)->p;
+        hdr_size = msg_hdr_sz(&tport->phdr);
+
         while (curr_iovlen--) {
                 curr_start = curr_iov->iov_base;
                 curr_left = curr_iov->iov_len;
 
                 while (curr_left) {
-                        bytes_to_send = (curr_left < TIPC_MAX_USER_MSG_SIZE)
-                                ? curr_left : TIPC_MAX_USER_MSG_SIZE;
+                        bytes_to_send = tport->max_pkt - hdr_size;
+                        if (bytes_to_send > TIPC_MAX_USER_MSG_SIZE)
+                                bytes_to_send = TIPC_MAX_USER_MSG_SIZE;
+                        if (curr_left < bytes_to_send)
+                                bytes_to_send = curr_left;
                         my_iov.iov_base = curr_start;
                         my_iov.iov_len = bytes_to_send;
                         if ((res = send_packet(iocb, sock, &my_msg, 0)) < 0) {
-                                return bytes_sent ? bytes_sent : res;
+                                if (bytes_sent != 0)
+                                        res = bytes_sent;
+                                return res;
                         }
                         curr_left -= bytes_to_send;
                         curr_start += bytes_to_send;
@@ -1600,33 +1609,6 @@ static int getsockopt(struct socket *sock,
 }
 
 /**
- * Placeholders for non-implemented functionality
- *
- * Returns error code (POSIX-compliant where defined)
- */
-
-static int ioctl(struct socket *s, u32 cmd, unsigned long arg)
-{
-        return -EINVAL;
-}
-
-static int no_mmap(struct file *file, struct socket *sock,
-                   struct vm_area_struct *vma)
-{
-        return -EINVAL;
-}
-static ssize_t no_sendpage(struct socket *sock, struct page *page,
-                           int offset, size_t size, int flags)
-{
-        return -EINVAL;
-}
-
-static int no_skpair(struct socket *s1, struct socket *s2)
-{
-        return -EOPNOTSUPP;
-}
-
-/**
  * Protocol switches for the various types of TIPC sockets
  */
 
@@ -1636,19 +1618,19 @@ static struct proto_ops msg_ops = {
         .release        = release,
         .bind           = bind,
         .connect        = connect,
-        .socketpair     = no_skpair,
+        .socketpair     = sock_no_socketpair,
         .accept         = accept,
         .getname        = get_name,
         .poll           = poll,
-        .ioctl          = ioctl,
+        .ioctl          = sock_no_ioctl,
         .listen         = listen,
         .shutdown       = shutdown,
         .setsockopt     = setsockopt,
         .getsockopt     = getsockopt,
         .sendmsg        = send_msg,
         .recvmsg        = recv_msg,
-        .mmap           = no_mmap,
-        .sendpage       = no_sendpage
+        .mmap           = sock_no_mmap,
+        .sendpage       = sock_no_sendpage
 };
 
 static struct proto_ops packet_ops = {
@@ -1657,19 +1639,19 @@ static struct proto_ops packet_ops = {
         .release        = release,
         .bind           = bind,
         .connect        = connect,
-        .socketpair     = no_skpair,
+        .socketpair     = sock_no_socketpair,
         .accept         = accept,
         .getname        = get_name,
         .poll           = poll,
-        .ioctl          = ioctl,
+        .ioctl          = sock_no_ioctl,
         .listen         = listen,
         .shutdown       = shutdown,
         .setsockopt     = setsockopt,
         .getsockopt     = getsockopt,
         .sendmsg        = send_packet,
         .recvmsg        = recv_msg,
-        .mmap           = no_mmap,
-        .sendpage       = no_sendpage
+        .mmap           = sock_no_mmap,
+        .sendpage       = sock_no_sendpage
 };
 
 static struct proto_ops stream_ops = {
@@ -1678,19 +1660,19 @@ static struct proto_ops stream_ops = {
         .release        = release,
         .bind           = bind,
         .connect        = connect,
-        .socketpair     = no_skpair,
+        .socketpair     = sock_no_socketpair,
         .accept         = accept,
         .getname        = get_name,
         .poll           = poll,
-        .ioctl          = ioctl,
+        .ioctl          = sock_no_ioctl,
         .listen         = listen,
         .shutdown       = shutdown,
         .setsockopt     = setsockopt,
         .getsockopt     = getsockopt,
         .sendmsg        = send_stream,
         .recvmsg        = recv_stream,
-        .mmap           = no_mmap,
-        .sendpage       = no_sendpage
+        .mmap           = sock_no_mmap,
+        .sendpage       = sock_no_sendpage
 };
 
 static struct net_proto_family tipc_family_ops = {