Merge branch 'merge-fixes' into devel

10 files changed, 993 insertions, 753 deletions

diff --git a/net/tipc/core.c b/net/tipc/core.c
index d2d7d32c02c7..740aac5cdfb6 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -48,16 +48,8 @@
 #include "subscr.h"
 #include "config.h"
 
-int  tipc_eth_media_start(void);
-void tipc_eth_media_stop(void);
-int  tipc_handler_start(void);
-void tipc_handler_stop(void);
-int  tipc_socket_init(void);
-void tipc_socket_stop(void);
-int  tipc_netlink_start(void);
-void tipc_netlink_stop(void);
 
-#define TIPC_MOD_VER "1.6.2"
+#define TIPC_MOD_VER "1.6.3"
 
 #ifndef CONFIG_TIPC_ZONES
 #define CONFIG_TIPC_ZONES 3
@@ -277,7 +269,6 @@ EXPORT_SYMBOL(tipc_register_media);
 /* TIPC API for external APIs (see tipc_port.h) */
 
 EXPORT_SYMBOL(tipc_createport_raw);
-EXPORT_SYMBOL(tipc_set_msg_option);
 EXPORT_SYMBOL(tipc_reject_msg);
 EXPORT_SYMBOL(tipc_send_buf_fast);
 EXPORT_SYMBOL(tipc_acknowledge);
diff --git a/net/tipc/core.h b/net/tipc/core.h
index feabca580820..325404fd4eb5 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -180,6 +180,12 @@ extern int  tipc_core_start(void);
 extern void tipc_core_stop(void);
 extern int  tipc_core_start_net(void);
 extern void tipc_core_stop_net(void);
+extern int  tipc_handler_start(void);
+extern void tipc_handler_stop(void);
+extern int  tipc_netlink_start(void);
+extern void tipc_netlink_stop(void);
+extern int  tipc_socket_init(void);
+extern void tipc_socket_stop(void);
 
 static inline int delimit(int val, int min, int max)
 {
@@ -310,7 +316,7 @@ static inline struct sk_buff *buf_acquire(u32 size)
         struct sk_buff *skb;
         unsigned int buf_size = (BUF_HEADROOM + size + 3) & ~3u;
 
-        skb = alloc_skb(buf_size, GFP_ATOMIC);
+        skb = alloc_skb_fclone(buf_size, GFP_ATOMIC);
         if (skb) {
                 skb_reserve(skb, BUF_HEADROOM);
                 skb_put(skb, size);
@@ -328,8 +334,19 @@ static inline struct sk_buff *buf_acquire(u32 size)
 
 static inline void buf_discard(struct sk_buff *skb)
 {
-        if (likely(skb != NULL))
-                kfree_skb(skb);
+        kfree_skb(skb);
+}
+
+/**
+ * buf_linearize - convert a TIPC message buffer into a single contiguous piece
+ * @skb: message buffer
+ *
+ * Returns 0 on success.
+ */
+
+static inline int buf_linearize(struct sk_buff *skb)
+{
+        return skb_linearize(skb);
 }
 
 #endif
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 3bbef2ab22ae..9cd35eec3e7f 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -101,7 +101,7 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev,
         struct eth_bearer *eb_ptr = (struct eth_bearer *)pt->af_packet_priv;
         u32 size;
 
-        if (dev->nd_net != &init_net) {
+        if (dev_net(dev) != &init_net) {
                 kfree_skb(buf);
                 return 0;
         }
@@ -198,7 +198,7 @@ static int recv_notification(struct notifier_block *nb, unsigned long evt,
         struct eth_bearer *eb_ptr = &eth_bearers[0];
         struct eth_bearer *stop = &eth_bearers[MAX_ETH_BEARERS];
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 return NOTIFY_DONE;
 
         while ((eb_ptr->dev != dev)) {
diff --git a/net/tipc/link.c b/net/tipc/link.c
index cefa99824c58..2a26a16e269f 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1785,6 +1785,56 @@ static struct sk_buff *link_insert_deferred_queue(struct link *l_ptr,
         return buf;
 }
 
+/**
+ * link_recv_buf_validate - validate basic format of received message
+ *
+ * This routine ensures a TIPC message has an acceptable header, and at least
+ * as much data as the header indicates it should.  The routine also ensures
+ * that the entire message header is stored in the main fragment of the message
+ * buffer, to simplify future access to message header fields.
+ *
+ * Note: Having extra info present in the message header or data areas is OK.
+ * TIPC will ignore the excess, under the assumption that it is optional info
+ * introduced by a later release of the protocol.
+ */
+
+static int link_recv_buf_validate(struct sk_buff *buf)
+{
+        static u32 min_data_hdr_size[8] = {
+                SHORT_H_SIZE, MCAST_H_SIZE, LONG_H_SIZE, DIR_MSG_H_SIZE,
+                MAX_H_SIZE, MAX_H_SIZE, MAX_H_SIZE, MAX_H_SIZE
+                };
+
+        struct tipc_msg *msg;
+        u32 tipc_hdr[2];
+        u32 size;
+        u32 hdr_size;
+        u32 min_hdr_size;
+
+        if (unlikely(buf->len < MIN_H_SIZE))
+                return 0;
+
+        msg = skb_header_pointer(buf, 0, sizeof(tipc_hdr), tipc_hdr);
+        if (msg == NULL)
+                return 0;
+
+        if (unlikely(msg_version(msg) != TIPC_VERSION))
+                return 0;
+
+        size = msg_size(msg);
+        hdr_size = msg_hdr_sz(msg);
+        min_hdr_size = msg_isdata(msg) ?
+                min_data_hdr_size[msg_type(msg)] : INT_H_SIZE;
+
+        if (unlikely((hdr_size < min_hdr_size) ||
+                     (size < hdr_size) ||
+                     (buf->len < size) ||
+                     (size - hdr_size > TIPC_MAX_USER_MSG_SIZE)))
+                return 0;
+
+        return pskb_may_pull(buf, hdr_size);
+}
+
 void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *tb_ptr)
 {
         read_lock_bh(&tipc_net_lock);
@@ -1794,9 +1844,9 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *tb_ptr)
                 struct link *l_ptr;
                 struct sk_buff *crs;
                 struct sk_buff *buf = head;
-                struct tipc_msg *msg = buf_msg(buf);
-                u32 seq_no = msg_seqno(msg);
-                u32 ackd = msg_ack(msg);
+                struct tipc_msg *msg;
+                u32 seq_no;
+                u32 ackd;
                 u32 released = 0;
                 int type;
 
@@ -1804,12 +1854,21 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *tb_ptr)
                 TIPC_SKB_CB(buf)->handle = b_ptr;
 
                 head = head->next;
-                if (unlikely(msg_version(msg) != TIPC_VERSION))
+
+                /* Ensure message is well-formed */
+
+                if (unlikely(!link_recv_buf_validate(buf)))
                         goto cont;
-#if 0
-                if (msg_user(msg) != LINK_PROTOCOL)
-#endif
-                        msg_dbg(msg,"<REC<");
+
+                /* Ensure message data is a single contiguous unit */
+
+                if (unlikely(buf_linearize(buf))) {
+                        goto cont;
+                }
+
+                /* Handle arrival of a non-unicast link message */
+
+                msg = buf_msg(buf);
 
                 if (unlikely(msg_non_seq(msg))) {
                         link_recv_non_seq(buf);
@@ -1820,19 +1879,26 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *tb_ptr)
                              (msg_destnode(msg) != tipc_own_addr)))
                         goto cont;
 
+                /* Locate unicast link endpoint that should handle message */
+
                 n_ptr = tipc_node_find(msg_prevnode(msg));
                 if (unlikely(!n_ptr))
                         goto cont;
-
                 tipc_node_lock(n_ptr);
+
                 l_ptr = n_ptr->links[b_ptr->identity];
                 if (unlikely(!l_ptr)) {
                         tipc_node_unlock(n_ptr);
                         goto cont;
                 }
-                /*
-                 * Release acked messages
-                 */
+
+                /* Validate message sequence number info */
+
+                seq_no = msg_seqno(msg);
+                ackd = msg_ack(msg);
+
+                /* Release acked messages */
+
                 if (less(n_ptr->bclink.acked, msg_bcast_ack(msg))) {
                         if (tipc_node_is_up(n_ptr) && n_ptr->bclink.supported)
                                 tipc_bclink_acknowledge(n_ptr, msg_bcast_ack(msg));
@@ -1851,6 +1917,9 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *tb_ptr)
                         l_ptr->first_out = crs;
                         l_ptr->out_queue_size -= released;
                 }
+
+                /* Try sending any messages link endpoint has pending */
+
                 if (unlikely(l_ptr->next_out))
                         tipc_link_push_queue(l_ptr);
                 if (unlikely(!list_empty(&l_ptr->waiting_ports)))
@@ -1860,6 +1929,8 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *tb_ptr)
                         tipc_link_send_proto_msg(l_ptr, STATE_MSG, 0, 0, 0, 0, 0);
                 }
 
+                /* Now (finally!) process the incoming message */
+
 protocol_check:
                 if (likely(link_working_working(l_ptr))) {
                         if (likely(seq_no == mod(l_ptr->next_in_no))) {
@@ -2832,15 +2903,15 @@ static void link_set_supervision_props(struct link *l_ptr, u32 tolerance)
 void tipc_link_set_queue_limits(struct link *l_ptr, u32 window)
 {
         /* Data messages from this node, inclusive FIRST_FRAGM */
-        l_ptr->queue_limit[DATA_LOW] = window;
-        l_ptr->queue_limit[DATA_MEDIUM] = (window / 3) * 4;
-        l_ptr->queue_limit[DATA_HIGH] = (window / 3) * 5;
-        l_ptr->queue_limit[DATA_CRITICAL] = (window / 3) * 6;
+        l_ptr->queue_limit[TIPC_LOW_IMPORTANCE] = window;
+        l_ptr->queue_limit[TIPC_MEDIUM_IMPORTANCE] = (window / 3) * 4;
+        l_ptr->queue_limit[TIPC_HIGH_IMPORTANCE] = (window / 3) * 5;
+        l_ptr->queue_limit[TIPC_CRITICAL_IMPORTANCE] = (window / 3) * 6;
         /* Transiting data messages,inclusive FIRST_FRAGM */
-        l_ptr->queue_limit[DATA_LOW + 4] = 300;
-        l_ptr->queue_limit[DATA_MEDIUM + 4] = 600;
-        l_ptr->queue_limit[DATA_HIGH + 4] = 900;
-        l_ptr->queue_limit[DATA_CRITICAL + 4] = 1200;
+        l_ptr->queue_limit[TIPC_LOW_IMPORTANCE + 4] = 300;
+        l_ptr->queue_limit[TIPC_MEDIUM_IMPORTANCE + 4] = 600;
+        l_ptr->queue_limit[TIPC_HIGH_IMPORTANCE + 4] = 900;
+        l_ptr->queue_limit[TIPC_CRITICAL_IMPORTANCE + 4] = 1200;
         l_ptr->queue_limit[CONN_MANAGER] = 1200;
         l_ptr->queue_limit[ROUTE_DISTRIBUTOR] = 1200;
         l_ptr->queue_limit[CHANGEOVER_PROTOCOL] = 2500;
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 782485468fb2..696a8633df75 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -73,10 +73,10 @@ void tipc_msg_print(struct print_buf *buf, struct tipc_msg *msg, const char *str
                 tipc_printf(buf, "NO(%u/%u):",msg_long_msgno(msg),
                             msg_fragm_no(msg));
                 break;
-        case DATA_LOW:
-        case DATA_MEDIUM:
-        case DATA_HIGH:
-        case DATA_CRITICAL:
+        case TIPC_LOW_IMPORTANCE:
+        case TIPC_MEDIUM_IMPORTANCE:
+        case TIPC_HIGH_IMPORTANCE:
+        case TIPC_CRITICAL_IMPORTANCE:
                 tipc_printf(buf, "DAT%u:", msg_user(msg));
                 if (msg_short(msg)) {
                         tipc_printf(buf, "CON:");
@@ -229,10 +229,10 @@ void tipc_msg_print(struct print_buf *buf, struct tipc_msg *msg, const char *str
         switch (usr) {
         case CONN_MANAGER:
         case NAME_DISTRIBUTOR:
-        case DATA_LOW:
-        case DATA_MEDIUM:
-        case DATA_HIGH:
-        case DATA_CRITICAL:
+        case TIPC_LOW_IMPORTANCE:
+        case TIPC_MEDIUM_IMPORTANCE:
+        case TIPC_HIGH_IMPORTANCE:
+        case TIPC_CRITICAL_IMPORTANCE:
                 if (msg_short(msg))
                         break;  /* No error */
                 switch (msg_errcode(msg)) {
diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index e9ef6df26562..6ad070d87702 100644
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -40,18 +40,16 @@
 #include "core.h"
 
 #define TIPC_VERSION              2
-#define DATA_LOW                  TIPC_LOW_IMPORTANCE
-#define DATA_MEDIUM               TIPC_MEDIUM_IMPORTANCE
-#define DATA_HIGH                 TIPC_HIGH_IMPORTANCE
-#define DATA_CRITICAL             TIPC_CRITICAL_IMPORTANCE
-#define SHORT_H_SIZE              24    /* Connected,in cluster */
+
+#define SHORT_H_SIZE              24    /* Connected, in-cluster messages */
 #define DIR_MSG_H_SIZE            32    /* Directly addressed messages */
-#define CONN_MSG_H_SIZE           36    /* Routed connected msgs*/
-#define LONG_H_SIZE               40    /* Named Messages */
+#define LONG_H_SIZE               40    /* Named messages */
 #define MCAST_H_SIZE              44    /* Multicast messages */
-#define MAX_H_SIZE                60    /* Inclusive full options */
+#define INT_H_SIZE                40    /* Internal messages */
+#define MIN_H_SIZE                24    /* Smallest legal TIPC header size */
+#define MAX_H_SIZE                60    /* Largest possible TIPC header size */
+
 #define MAX_MSG_SIZE (MAX_H_SIZE + TIPC_MAX_USER_MSG_SIZE)
-#define LINK_CONFIG               13
 
 
 /*
@@ -72,8 +70,10 @@ static inline void msg_set_bits(struct tipc_msg *m, u32 w,
                                 u32 pos, u32 mask, u32 val)
 {
         val = (val & mask) << pos;
-        m->hdr[w] &= ~htonl(mask << pos);
-        m->hdr[w] |= htonl(val);
+        val = htonl(val);
+        mask = htonl(mask << pos);
+        m->hdr[w] &= ~mask;
+        m->hdr[w] |= val;
 }
 
 /*
@@ -87,7 +87,7 @@ static inline u32 msg_version(struct tipc_msg *m)
 
 static inline void msg_set_version(struct tipc_msg *m)
 {
-        msg_set_bits(m, 0, 29, 0xf, TIPC_VERSION);
+        msg_set_bits(m, 0, 29, 7, TIPC_VERSION);
 }
 
 static inline u32 msg_user(struct tipc_msg *m)
@@ -97,7 +97,7 @@ static inline u32 msg_user(struct tipc_msg *m)
 
 static inline u32 msg_isdata(struct tipc_msg *m)
 {
-        return (msg_user(m) <= DATA_CRITICAL);
+        return (msg_user(m) <= TIPC_CRITICAL_IMPORTANCE);
 }
 
 static inline void msg_set_user(struct tipc_msg *m, u32 n)
@@ -190,18 +190,6 @@ static inline void msg_set_lookup_scope(struct tipc_msg *m, u32 n)
         msg_set_bits(m, 1, 19, 0x3, n);
 }
 
-static inline void msg_set_options(struct tipc_msg *m, const char *opt, u32 sz)
-{
-        u32 hsz = msg_hdr_sz(m);
-        char *to = (char *)&m->hdr[hsz/4];
-
-        if ((hsz < DIR_MSG_H_SIZE) || ((hsz + sz) > MAX_H_SIZE))
-                return;
-        msg_set_bits(m, 1, 16, 0x7, (hsz - 28)/4);
-        msg_set_hdr_sz(m, hsz + sz);
-        memcpy(to, opt, sz);
-}
-
 static inline u32 msg_bcast_ack(struct tipc_msg *m)
 {
         return msg_bits(m, 1, 0, 0xffff);
@@ -330,17 +318,6 @@ static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m)
         return (struct tipc_msg *)msg_data(m);
 }
 
-static inline void msg_expand(struct tipc_msg *m, u32 destnode)
-{
-        if (!msg_short(m))
-                return;
-        msg_set_hdr_sz(m, LONG_H_SIZE);
-        msg_set_orignode(m, msg_prevnode(m));
-        msg_set_destnode(m, destnode);
-        memset(&m->hdr[8], 0, 12);
-}
-
-
 
 /*
                 TIPC internal message header format, version 2
@@ -388,7 +365,6 @@ static inline void msg_expand(struct tipc_msg *m, u32 destnode)
 #define  NAME_DISTRIBUTOR     11
 #define  MSG_FRAGMENTER       12
 #define  LINK_CONFIG          13
-#define  INT_H_SIZE           40
 #define  DSC_H_SIZE           40
 
 /*
diff --git a/net/tipc/port.c b/net/tipc/port.c
index f508614ca59b..2f5806410c64 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -242,7 +242,8 @@ u32 tipc_createport_raw(void *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);
+        msg_init(msg, TIPC_LOW_IMPORTANCE, TIPC_NAMED_MSG, TIPC_OK, LONG_H_SIZE,
+                 0);
         msg_set_orignode(msg, tipc_own_addr);
         msg_set_prevnode(msg, tipc_own_addr);
         msg_set_origport(msg, ref);
@@ -413,13 +414,6 @@ static struct sk_buff *port_build_proto_msg(u32 destport, u32 destnode,
         return buf;
 }
 
-int tipc_set_msg_option(struct tipc_port *tp_ptr, const char *opt, const u32 sz)
-{
-        msg_expand(&tp_ptr->phdr, msg_destnode(&tp_ptr->phdr));
-        msg_set_options(&tp_ptr->phdr, opt, sz);
-        return TIPC_OK;
-}
-
 int tipc_reject_msg(struct sk_buff *buf, u32 err)
 {
         struct tipc_msg *msg = buf_msg(buf);
@@ -632,7 +626,7 @@ void tipc_port_recv_proto_msg(struct sk_buff *buf)
                                              msg_orignode(msg),
                                              msg_destport(msg),
                                              tipc_own_addr,
-                                             DATA_HIGH,
+                                             TIPC_HIGH_IMPORTANCE,
                                              TIPC_CONN_MSG,
                                              err,
                                              0,
@@ -1246,6 +1240,28 @@ exit:
         return res;
 }
 
+/**
+ * tipc_disconnect_port - disconnect port from peer
+ *
+ * Port must be locked.
+ */
+
+int tipc_disconnect_port(struct tipc_port *tp_ptr)
+{
+        int res;
+
+        if (tp_ptr->connected) {
+                tp_ptr->connected = 0;
+                /* let timer expire on it's own to avoid deadlock! */
+                tipc_nodesub_unsubscribe(
+                        &((struct port *)tp_ptr)->subscription);
+                res = TIPC_OK;
+        } else {
+                res = -ENOTCONN;
+        }
+        return res;
+}
+
 /*
  * tipc_disconnect(): Disconnect port form peer.
  *                    This is a node local operation.
@@ -1254,17 +1270,12 @@ exit:
 int tipc_disconnect(u32 ref)
 {
         struct port *p_ptr;
-        int res = -ENOTCONN;
+        int res;
 
         p_ptr = tipc_port_lock(ref);
         if (!p_ptr)
                 return -EINVAL;
-        if (p_ptr->publ.connected) {
-                p_ptr->publ.connected = 0;
-                /* let timer expire on it's own to avoid deadlock! */
-                tipc_nodesub_unsubscribe(&p_ptr->subscription);
-                res = TIPC_OK;
-        }
+        res = tipc_disconnect_port((struct tipc_port *)p_ptr);
         tipc_port_unlock(p_ptr);
         return res;
 }
diff --git a/net/tipc/ref.c b/net/tipc/ref.c
index c38744c96ed1..89cbab24d08f 100644
--- a/net/tipc/ref.c
+++ b/net/tipc/ref.c
@@ -2,7 +2,7 @@
  * net/tipc/ref.c: TIPC object registry code
  *
  * Copyright (c) 1991-2006, Ericsson AB
- * Copyright (c) 2004-2005, Wind River Systems
+ * Copyright (c) 2004-2007, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,32 +36,60 @@
 
 #include "core.h"
 #include "ref.h"
-#include "port.h"
-#include "subscr.h"
-#include "name_distr.h"
-#include "name_table.h"
-#include "config.h"
-#include "discover.h"
-#include "bearer.h"
-#include "node.h"
-#include "bcast.h"
+
+/**
+ * struct reference - TIPC object reference entry
+ * @object: pointer to object associated with reference entry
+ * @lock: spinlock controlling access to object
+ * @ref: reference value for object (combines instance & array index info)
+ */
+
+struct reference {
+        void *object;
+        spinlock_t lock;
+        u32 ref;
+};
+
+/**
+ * struct tipc_ref_table - table of TIPC object reference entries
+ * @entries: pointer to array of reference entries
+ * @capacity: array index of first unusable entry
+ * @init_point: array index of first uninitialized entry
+ * @first_free: array index of first unused object reference entry
+ * @last_free: array index of last unused object reference entry
+ * @index_mask: bitmask for array index portion of reference values
+ * @start_mask: initial value for instance value portion of reference values
+ */
+
+struct ref_table {
+        struct reference *entries;
+        u32 capacity;
+        u32 init_point;
+        u32 first_free;
+        u32 last_free;
+        u32 index_mask;
+        u32 start_mask;
+};
 
 /*
  * Object reference table consists of 2**N entries.
  *
- * A used entry has object ptr != 0, reference == XXXX|own index
- *                                   (XXXX changes each time entry is acquired)
- * A free entry has object ptr == 0, reference == YYYY|next free index
- *                                   (YYYY is one more than last used XXXX)
+ * State        Object ptr      Reference
+ * -----        ----------      ---------
+ * In use        non-NULL       XXXX|own index
+ *                              (XXXX changes each time entry is acquired)
+ * Free            NULL         YYYY|next free index
+ *                              (YYYY is one more than last used XXXX)
+ * Uninitialized   NULL         0
  *
- * Free list is initially chained from entry (2**N)-1 to entry 1.
- * Entry 0 is not used to allow index 0 to indicate the end of the free list.
+ * Entry 0 is not used; this allows index 0 to denote the end of the free list.
  *
- * Note: Any accidental reference of the form XXXX|0--0 won't match entry 0
- * because entry 0's reference field has the form XXXX|1--1.
+ * Note that a reference value of 0 does not necessarily indicate that an
+ * entry is uninitialized, since the last entry in the free list could also
+ * have a reference value of 0 (although this is unlikely).
  */
 
-struct ref_table tipc_ref_table = { NULL };
+static struct ref_table tipc_ref_table = { NULL };
 
 static DEFINE_RWLOCK(ref_table_lock);
 
@@ -72,29 +100,29 @@ static DEFINE_RWLOCK(ref_table_lock);
 int tipc_ref_table_init(u32 requested_size, u32 start)
 {
         struct reference *table;
-        u32 sz = 1 << 4;
-        u32 index_mask;
-        int i;
+        u32 actual_size;
 
-        while (sz < requested_size) {
-                sz <<= 1;
-        }
-        table = vmalloc(sz * sizeof(*table));
+        /* account for unused entry, then round up size to a power of 2 */
+
+        requested_size++;
+        for (actual_size = 16; actual_size < requested_size; actual_size <<= 1)
+                /* do nothing */ ;
+
+        /* allocate table & mark all entries as uninitialized */
+
+        table = __vmalloc(actual_size * sizeof(struct reference),
+                          GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);
         if (table == NULL)
                 return -ENOMEM;
 
-        write_lock_bh(&ref_table_lock);
-        index_mask = sz - 1;
-        for (i = sz - 1; i >= 0; i--) {
-                table[i].object = NULL;
-                spin_lock_init(&table[i].lock);
-                table[i].data.next_plus_upper = (start & ~index_mask) + i - 1;
-        }
         tipc_ref_table.entries = table;
-        tipc_ref_table.index_mask = index_mask;
-        tipc_ref_table.first_free = sz - 1;
-        tipc_ref_table.last_free = 1;
-        write_unlock_bh(&ref_table_lock);
+        tipc_ref_table.capacity = requested_size;
+        tipc_ref_table.init_point = 1;
+        tipc_ref_table.first_free = 0;
+        tipc_ref_table.last_free = 0;
+        tipc_ref_table.index_mask = actual_size - 1;
+        tipc_ref_table.start_mask = start & ~tipc_ref_table.index_mask;
+
         return TIPC_OK;
 }
 
@@ -125,7 +153,7 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock)
         u32 index;
         u32 index_mask;
         u32 next_plus_upper;
-        u32 reference = 0;
+        u32 ref;
 
         if (!object) {
                 err("Attempt to acquire reference to non-existent object\n");
@@ -136,6 +164,8 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock)
                 return 0;
         }
 
+        /* take a free entry, if available; otherwise initialize a new entry */
+
         write_lock_bh(&ref_table_lock);
         if (tipc_ref_table.first_free) {
                 index = tipc_ref_table.first_free;
@@ -143,17 +173,29 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock)
                 index_mask = tipc_ref_table.index_mask;
                 /* take lock in case a previous user of entry still holds it */
                 spin_lock_bh(&entry->lock);
-                next_plus_upper = entry->data.next_plus_upper;
+                next_plus_upper = entry->ref;
                 tipc_ref_table.first_free = next_plus_upper & index_mask;
-                reference = (next_plus_upper & ~index_mask) + index;
-                entry->data.reference = reference;
+                ref = (next_plus_upper & ~index_mask) + index;
+                entry->ref = ref;
                 entry->object = object;
-                if (lock != NULL)
-                        *lock = &entry->lock;
                 spin_unlock_bh(&entry->lock);
+                *lock = &entry->lock;
+        }
+        else if (tipc_ref_table.init_point < tipc_ref_table.capacity) {
+                index = tipc_ref_table.init_point++;
+                entry = &(tipc_ref_table.entries[index]);
+                spin_lock_init(&entry->lock);
+                ref = tipc_ref_table.start_mask + index;
+                entry->ref = ref;
+                entry->object = object;
+                *lock = &entry->lock;
+        }
+        else {
+                ref = 0;
         }
         write_unlock_bh(&ref_table_lock);
-        return reference;
+
+        return ref;
 }
 
 /**
@@ -169,42 +211,99 @@ void tipc_ref_discard(u32 ref)
         u32 index;
         u32 index_mask;
 
-        if (!ref) {
-                err("Attempt to discard reference 0\n");
-                return;
-        }
         if (!tipc_ref_table.entries) {
                 err("Reference table not found during discard attempt\n");
                 return;
         }
 
-        write_lock_bh(&ref_table_lock);
         index_mask = tipc_ref_table.index_mask;
         index = ref & index_mask;
         entry = &(tipc_ref_table.entries[index]);
 
+        write_lock_bh(&ref_table_lock);
+
         if (!entry->object) {
                 err("Attempt to discard reference to non-existent object\n");
                 goto exit;
         }
-        if (entry->data.reference != ref) {
+        if (entry->ref != ref) {
                 err("Attempt to discard non-existent reference\n");
                 goto exit;
         }
 
-        /* mark entry as unused */
+        /*
+         * mark entry as unused; increment instance part of entry's reference
+         * to invalidate any subsequent references
+         */
+
         entry->object = NULL;
+        entry->ref = (ref & ~index_mask) + (index_mask + 1);
+
+        /* append entry to free entry list */
+
         if (tipc_ref_table.first_free == 0)
                 tipc_ref_table.first_free = index;
         else
-                /* next_plus_upper is always XXXX|0--0 for last free entry */
-                tipc_ref_table.entries[tipc_ref_table.last_free].data.next_plus_upper
-                        |= index;
+                tipc_ref_table.entries[tipc_ref_table.last_free].ref |= index;
         tipc_ref_table.last_free = index;
 
-        /* increment upper bits of entry to invalidate subsequent references */
-        entry->data.next_plus_upper = (ref & ~index_mask) + (index_mask + 1);
 exit:
         write_unlock_bh(&ref_table_lock);
 }
 
+/**
+ * tipc_ref_lock - lock referenced object and return pointer to it
+ */
+
+void *tipc_ref_lock(u32 ref)
+{
+        if (likely(tipc_ref_table.entries)) {
+                struct reference *entry;
+
+                entry = &tipc_ref_table.entries[ref &
+                                                tipc_ref_table.index_mask];
+                if (likely(entry->ref != 0)) {
+                        spin_lock_bh(&entry->lock);
+                        if (likely((entry->ref == ref) && (entry->object)))
+                                return entry->object;
+                        spin_unlock_bh(&entry->lock);
+                }
+        }
+        return NULL;
+}
+
+/**
+ * tipc_ref_unlock - unlock referenced object
+ */
+
+void tipc_ref_unlock(u32 ref)
+{
+        if (likely(tipc_ref_table.entries)) {
+                struct reference *entry;
+
+                entry = &tipc_ref_table.entries[ref &
+                                                tipc_ref_table.index_mask];
+                if (likely((entry->ref == ref) && (entry->object)))
+                        spin_unlock_bh(&entry->lock);
+                else
+                        err("Attempt to unlock non-existent reference\n");
+        }
+}
+
+/**
+ * tipc_ref_deref - return pointer referenced object (without locking it)
+ */
+
+void *tipc_ref_deref(u32 ref)
+{
+        if (likely(tipc_ref_table.entries)) {
+                struct reference *entry;
+
+                entry = &tipc_ref_table.entries[ref &
+                                                tipc_ref_table.index_mask];
+                if (likely(entry->ref == ref))
+                        return entry->object;
+        }
+        return NULL;
+}
+
diff --git a/net/tipc/ref.h b/net/tipc/ref.h
index 38f3a7f4a78d..7e3798ea93b9 100644
--- a/net/tipc/ref.h
+++ b/net/tipc/ref.h
@@ -2,7 +2,7 @@
  * net/tipc/ref.h: Include file for TIPC object registry code
  *
  * Copyright (c) 1991-2006, Ericsson AB
- * Copyright (c) 2005, Wind River Systems
+ * Copyright (c) 2005-2006, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,95 +37,14 @@
 #ifndef _TIPC_REF_H
 #define _TIPC_REF_H
 
-/**
- * struct reference - TIPC object reference entry
- * @object: pointer to object associated with reference entry
- * @lock: spinlock controlling access to object
- * @data: reference value associated with object (or link to next unused entry)
- */
-
-struct reference {
-        void *object;
-        spinlock_t lock;
-        union {
-                u32 next_plus_upper;
-                u32 reference;
-        } data;
-};
-
-/**
- * struct tipc_ref_table - table of TIPC object reference entries
- * @entries: pointer to array of reference entries
- * @index_mask: bitmask for array index portion of reference values
- * @first_free: array index of first unused object reference entry
- * @last_free: array index of last unused object reference entry
- */
-
-struct ref_table {
-        struct reference *entries;
-        u32 index_mask;
-        u32 first_free;
-        u32 last_free;
-};
-
-extern struct ref_table tipc_ref_table;
-
 int tipc_ref_table_init(u32 requested_size, u32 start);
 void tipc_ref_table_stop(void);
 
 u32 tipc_ref_acquire(void *object, spinlock_t **lock);
 void tipc_ref_discard(u32 ref);
 
-
-/**
- * tipc_ref_lock - lock referenced object and return pointer to it
- */
-
-static inline void *tipc_ref_lock(u32 ref)
-{
-        if (likely(tipc_ref_table.entries)) {
-                struct reference *r =
-                        &tipc_ref_table.entries[ref & tipc_ref_table.index_mask];
-
-                spin_lock_bh(&r->lock);
-                if (likely(r->data.reference == ref))
-                        return r->object;
-                spin_unlock_bh(&r->lock);
-        }
-        return NULL;
-}
-
-/**
- * tipc_ref_unlock - unlock referenced object
- */
-
-static inline void tipc_ref_unlock(u32 ref)
-{
-        if (likely(tipc_ref_table.entries)) {
-                struct reference *r =
-                        &tipc_ref_table.entries[ref & tipc_ref_table.index_mask];
-
-                if (likely(r->data.reference == ref))
-                        spin_unlock_bh(&r->lock);
-                else
-                        err("tipc_ref_unlock() invoked using obsolete reference\n");
-        }
-}
-
-/**
- * tipc_ref_deref - return pointer referenced object (without locking it)
- */
-
-static inline void *tipc_ref_deref(u32 ref)
-{
-        if (likely(tipc_ref_table.entries)) {
-                struct reference *r =
-                        &tipc_ref_table.entries[ref & tipc_ref_table.index_mask];
-
-                if (likely(r->data.reference == ref))
-                        return r->object;
-        }
-        return NULL;
-}
+void *tipc_ref_lock(u32 ref);
+void tipc_ref_unlock(u32 ref);
+void *tipc_ref_deref(u32 ref);
 
 #endif
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 22909036b9bc..05853159536a 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -43,7 +43,6 @@
 #include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/fcntl.h>
-#include <asm/semaphore.h>
 #include <asm/string.h>
 #include <asm/atomic.h>
 #include <net/sock.h>
@@ -58,16 +57,18 @@
 #define SS_LISTENING    -1      /* socket is listening */
 #define SS_READY        -2      /* socket is connectionless */
 
-#define OVERLOAD_LIMIT_BASE    5000
+#define OVERLOAD_LIMIT_BASE     5000
+#define CONN_TIMEOUT_DEFAULT    8000    /* default connect timeout = 8s */
 
 struct tipc_sock {
         struct sock sk;
         struct tipc_port *p;
-        struct semaphore sem;
 };
 
-#define tipc_sk(sk) ((struct tipc_sock*)sk)
+#define tipc_sk(sk) ((struct tipc_sock *)(sk))
+#define tipc_sk_port(sk) ((struct tipc_port *)(tipc_sk(sk)->p))
 
+static int backlog_rcv(struct sock *sk, struct sk_buff *skb);
 static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf);
 static void wakeupdispatch(struct tipc_port *tport);
 
@@ -81,93 +82,115 @@ static int sockets_enabled = 0;
 
 static atomic_t tipc_queue_size = ATOMIC_INIT(0);
 
-
 /*
- * sock_lock(): Lock a port/socket pair. lock_sock() can
- * not be used here, since the same lock must protect ports
- * with non-socket interfaces.
- * See net.c for description of locking policy.
+ * Revised TIPC socket locking policy:
+ *
+ * Most socket operations take the standard socket lock when they start
+ * and hold it until they finish (or until they need to sleep).  Acquiring
+ * this lock grants the owner exclusive access to the fields of the socket
+ * data structures, with the exception of the backlog queue.  A few socket
+ * operations can be done without taking the socket lock because they only
+ * read socket information that never changes during the life of the socket.
+ *
+ * Socket operations may acquire the lock for the associated TIPC port if they
+ * need to perform an operation on the port.  If any routine needs to acquire
+ * both the socket lock and the port lock it must take the socket lock first
+ * to avoid the risk of deadlock.
+ *
+ * The dispatcher handling incoming messages cannot grab the socket lock in
+ * the standard fashion, since invoked it runs at the BH level and cannot block.
+ * Instead, it checks to see if the socket lock is currently owned by someone,
+ * and either handles the message itself or adds it to the socket's backlog
+ * queue; in the latter case the queued message is processed once the process
+ * owning the socket lock releases it.
+ *
+ * NOTE: Releasing the socket lock while an operation is sleeping overcomes
+ * the problem of a blocked socket operation preventing any other operations
+ * from occurring.  However, applications must be careful if they have
+ * multiple threads trying to send (or receive) on the same socket, as these
+ * operations might interfere with each other.  For example, doing a connect
+ * and a receive at the same time might allow the receive to consume the
+ * ACK message meant for the connect.  While additional work could be done
+ * to try and overcome this, it doesn't seem to be worthwhile at the present.
+ *
+ * NOTE: Releasing the socket lock while an operation is sleeping also ensures
+ * that another operation that must be performed in a non-blocking manner is
+ * not delayed for very long because the lock has already been taken.
+ *
+ * NOTE: This code assumes that certain fields of a port/socket pair are
+ * constant over its lifetime; such fields can be examined without taking
+ * the socket lock and/or port lock, and do not need to be re-read even
+ * after resuming processing after waiting.  These fields include:
+ *   - socket type
+ *   - pointer to socket sk structure (aka tipc_sock structure)
+ *   - pointer to port structure
+ *   - port reference
  */
-static void sock_lock(struct tipc_sock* tsock)
-{
-        spin_lock_bh(tsock->p->lock);
-}
 
-/*
- * sock_unlock(): Unlock a port/socket pair
+/**
+ * advance_rx_queue - discard first buffer in socket receive queue
+ *
+ * Caller must hold socket lock
  */
-static void sock_unlock(struct tipc_sock* tsock)
+
+static void advance_rx_queue(struct sock *sk)
 {
-        spin_unlock_bh(tsock->p->lock);
+        buf_discard(__skb_dequeue(&sk->sk_receive_queue));
+        atomic_dec(&tipc_queue_size);
 }
 
 /**
- * pollmask - determine the current set of poll() events for a socket
- * @sock: socket structure
- *
- * TIPC sets the returned events as follows:
- * a) POLLRDNORM and POLLIN are set if the socket's receive queue is non-empty
- *    or if a connection-oriented socket is does not have an active connection
- *    (i.e. a read operation will not block).
- * b) POLLOUT is set except when a socket's connection has been terminated
- *    (i.e. a write operation will not block).
- * c) POLLHUP is set when a socket's connection has been terminated.
- *
- * IMPORTANT: The fact that a read or write operation will not block does NOT
- * imply that the operation will succeed!
+ * discard_rx_queue - discard all buffers in socket receive queue
  *
- * Returns pollmask value
+ * Caller must hold socket lock
  */
 
-static u32 pollmask(struct socket *sock)
+static void discard_rx_queue(struct sock *sk)
 {
-        u32 mask;
-
-        if ((skb_queue_len(&sock->sk->sk_receive_queue) != 0) ||
-            (sock->state == SS_UNCONNECTED) ||
-            (sock->state == SS_DISCONNECTING))
-                mask = (POLLRDNORM | POLLIN);
-        else
-                mask = 0;
-
-        if (sock->state == SS_DISCONNECTING)
-                mask |= POLLHUP;
-        else
-                mask |= POLLOUT;
+        struct sk_buff *buf;
 
-        return mask;
+        while ((buf = __skb_dequeue(&sk->sk_receive_queue))) {
+                atomic_dec(&tipc_queue_size);
+                buf_discard(buf);
+        }
 }
 
-
 /**
- * advance_queue - discard first buffer in queue
- * @tsock: TIPC socket
+ * reject_rx_queue - reject all buffers in socket receive queue
+ *
+ * Caller must hold socket lock
  */
 
-static void advance_queue(struct tipc_sock *tsock)
+static void reject_rx_queue(struct sock *sk)
 {
-        sock_lock(tsock);
-        buf_discard(skb_dequeue(&tsock->sk.sk_receive_queue));
-        sock_unlock(tsock);
-        atomic_dec(&tipc_queue_size);
+        struct sk_buff *buf;
+
+        while ((buf = __skb_dequeue(&sk->sk_receive_queue))) {
+                tipc_reject_msg(buf, TIPC_ERR_NO_PORT);
+                atomic_dec(&tipc_queue_size);
+        }
 }
 
 /**
  * tipc_create - create a TIPC socket
+ * @net: network namespace (must be default network)
  * @sock: pre-allocated socket structure
  * @protocol: protocol indicator (must be 0)
  *
- * This routine creates and attaches a 'struct sock' to the 'struct socket',
- * then create and attaches a TIPC port to the 'struct sock' part.
+ * This routine creates additional data structures used by the TIPC socket,
+ * initializes them, and links them together.
  *
  * Returns 0 on success, errno otherwise
  */
+
 static int tipc_create(struct net *net, struct socket *sock, int protocol)
 {
-        struct tipc_sock *tsock;
-        struct tipc_port *port;
+        const struct proto_ops *ops;
+        socket_state state;
         struct sock *sk;
-        u32 ref;
+        u32 portref;
+
+        /* Validate arguments */
 
         if (net != &init_net)
                 return -EAFNOSUPPORT;
@@ -175,54 +198,56 @@ static int tipc_create(struct net *net, struct socket *sock, int protocol)
         if (unlikely(protocol != 0))
                 return -EPROTONOSUPPORT;
 
-        ref = tipc_createport_raw(NULL, &dispatch, &wakeupdispatch, TIPC_LOW_IMPORTANCE);
-        if (unlikely(!ref))
-                return -ENOMEM;
-
-        sock->state = SS_UNCONNECTED;
-
         switch (sock->type) {
         case SOCK_STREAM:
-                sock->ops = &stream_ops;
+                ops = &stream_ops;
+                state = SS_UNCONNECTED;
                 break;
         case SOCK_SEQPACKET:
-                sock->ops = &packet_ops;
+                ops = &packet_ops;
+                state = SS_UNCONNECTED;
                 break;
         case SOCK_DGRAM:
-                tipc_set_portunreliable(ref, 1);
-                /* fall through */
         case SOCK_RDM:
-                tipc_set_portunreturnable(ref, 1);
-                sock->ops = &msg_ops;
-                sock->state = SS_READY;
+                ops = &msg_ops;
+                state = SS_READY;
                 break;
         default:
-                tipc_deleteport(ref);
                 return -EPROTOTYPE;
         }
 
+        /* Allocate socket's protocol area */
+
         sk = sk_alloc(net, AF_TIPC, GFP_KERNEL, &tipc_proto);
-        if (!sk) {
-                tipc_deleteport(ref);
+        if (sk == NULL)
                 return -ENOMEM;
-        }
 
-        sock_init_data(sock, sk);
-        init_waitqueue_head(sk->sk_sleep);
-        sk->sk_rcvtimeo = 8 * HZ;   /* default connect timeout = 8s */
+        /* Allocate TIPC port for socket to use */
 
-        tsock = tipc_sk(sk);
-        port = tipc_get_port(ref);
+        portref = tipc_createport_raw(sk, &dispatch, &wakeupdispatch,
+                                      TIPC_LOW_IMPORTANCE);
+        if (unlikely(portref == 0)) {
+                sk_free(sk);
+                return -ENOMEM;
+        }
 
-        tsock->p = port;
-        port->usr_handle = tsock;
+        /* Finish initializing socket data structures */
 
-        init_MUTEX(&tsock->sem);
+        sock->ops = ops;
+        sock->state = state;
 
-        dbg("sock_create: %x\n",tsock);
+        sock_init_data(sock, sk);
+        sk->sk_rcvtimeo = msecs_to_jiffies(CONN_TIMEOUT_DEFAULT);
+        sk->sk_backlog_rcv = backlog_rcv;
+        tipc_sk(sk)->p = tipc_get_port(portref);
 
-        atomic_inc(&tipc_user_count);
+        if (sock->state == SS_READY) {
+                tipc_set_portunreturnable(portref, 1);
+                if (sock->type == SOCK_DGRAM)
+                        tipc_set_portunreliable(portref, 1);
+        }
 
+        atomic_inc(&tipc_user_count);
         return 0;
 }
 
@@ -245,52 +270,62 @@ static int tipc_create(struct net *net, struct socket *sock, int protocol)
 
 static int release(struct socket *sock)
 {
-        struct tipc_sock *tsock = tipc_sk(sock->sk);
         struct sock *sk = sock->sk;
-        int res = TIPC_OK;
+        struct tipc_port *tport;
         struct sk_buff *buf;
+        int res;
 
-        dbg("sock_delete: %x\n",tsock);
-        if (!tsock)
-                return 0;
-        down(&tsock->sem);
-        if (!sock->sk) {
-                up(&tsock->sem);
+        /*
+         * Exit if socket isn't fully initialized (occurs when a failed accept()
+         * releases a pre-allocated child socket that was never used)
+         */
+
+        if (sk == NULL)
                 return 0;
-        }
 
-        /* Reject unreceived messages, unless no longer connected */
+        tport = tipc_sk_port(sk);
+        lock_sock(sk);
+
+        /*
+         * Reject all unreceived messages, except on an active connection
+         * (which disconnects locally & sends a 'FIN+' to peer)
+         */
 
         while (sock->state != SS_DISCONNECTING) {
-                sock_lock(tsock);
-                buf = skb_dequeue(&sk->sk_receive_queue);
-                if (!buf)
-                        tsock->p->usr_handle = NULL;
-                sock_unlock(tsock);
-                if (!buf)
+                buf = __skb_dequeue(&sk->sk_receive_queue);
+                if (buf == NULL)
                         break;
+                atomic_dec(&tipc_queue_size);
                 if (TIPC_SKB_CB(buf)->handle != msg_data(buf_msg(buf)))
                         buf_discard(buf);
-                else
+                else {
+                        if ((sock->state == SS_CONNECTING) ||
+                            (sock->state == SS_CONNECTED)) {
+                                sock->state = SS_DISCONNECTING;
+                                tipc_disconnect(tport->ref);
+                        }
                         tipc_reject_msg(buf, TIPC_ERR_NO_PORT);
-                atomic_dec(&tipc_queue_size);
+                }
         }
 
-        /* Delete TIPC port */
+        /*
+         * Delete TIPC port; this ensures no more messages are queued
+         * (also disconnects an active connection & sends a 'FIN-' to peer)
+         */
 
-        res = tipc_deleteport(tsock->p->ref);
-        sock->sk = NULL;
+        res = tipc_deleteport(tport->ref);
 
-        /* Discard any remaining messages */
+        /* Discard any remaining (connection-based) messages in receive queue */
 
-        while ((buf = skb_dequeue(&sk->sk_receive_queue))) {
-                buf_discard(buf);
-                atomic_dec(&tipc_queue_size);
-        }
+        discard_rx_queue(sk);
+
+        /* Reject any messages that accumulated in backlog queue */
 
-        up(&tsock->sem);
+        sock->state = SS_DISCONNECTING;
+        release_sock(sk);
 
         sock_put(sk);
+        sock->sk = NULL;
 
         atomic_dec(&tipc_user_count);
         return res;
@@ -307,47 +342,32 @@ static int release(struct socket *sock)
  * (i.e. a socket address length of 0) unbinds all names from the socket.
  *
  * Returns 0 on success, errno otherwise
+ *
+ * NOTE: This routine doesn't need to take the socket lock since it doesn't
+ *       access any non-constant socket information.
  */
 
 static int bind(struct socket *sock, struct sockaddr *uaddr, int uaddr_len)
 {
-        struct tipc_sock *tsock = tipc_sk(sock->sk);
         struct sockaddr_tipc *addr = (struct sockaddr_tipc *)uaddr;
-        int res;
+        u32 portref = tipc_sk_port(sock->sk)->ref;
 
-        if (down_interruptible(&tsock->sem))
-                return -ERESTARTSYS;
+        if (unlikely(!uaddr_len))
+                return tipc_withdraw(portref, 0, NULL);
 
-        if (unlikely(!uaddr_len)) {
-                res = tipc_withdraw(tsock->p->ref, 0, NULL);
-                goto exit;
-        }
-
-        if (uaddr_len < sizeof(struct sockaddr_tipc)) {
-                res = -EINVAL;
-                goto exit;
-        }
+        if (uaddr_len < sizeof(struct sockaddr_tipc))
+                return -EINVAL;
+        if (addr->family != AF_TIPC)
+                return -EAFNOSUPPORT;
 
-        if (addr->family != AF_TIPC) {
-                res = -EAFNOSUPPORT;
-                goto exit;
-        }
         if (addr->addrtype == TIPC_ADDR_NAME)
                 addr->addr.nameseq.upper = addr->addr.nameseq.lower;
-        else if (addr->addrtype != TIPC_ADDR_NAMESEQ) {
-                res = -EAFNOSUPPORT;
-                goto exit;
-        }
+        else if (addr->addrtype != TIPC_ADDR_NAMESEQ)
+                return -EAFNOSUPPORT;
 
-        if (addr->scope > 0)
-                res = tipc_publish(tsock->p->ref, addr->scope,
-                                   &addr->addr.nameseq);
-        else
-                res = tipc_withdraw(tsock->p->ref, -addr->scope,
-                                    &addr->addr.nameseq);
-exit:
-        up(&tsock->sem);
-        return res;
+        return (addr->scope > 0) ?
+                tipc_publish(portref, addr->scope, &addr->addr.nameseq) :
+                tipc_withdraw(portref, -addr->scope, &addr->addr.nameseq);
 }
 
 /**
@@ -358,30 +378,33 @@ exit:
  * @peer: 0 to obtain socket name, 1 to obtain peer socket name
  *
  * Returns 0 on success, errno otherwise
+ *
+ * NOTE: This routine doesn't need to take the socket lock since it doesn't
+ *       access any non-constant socket information.
  */
 
 static int get_name(struct socket *sock, struct sockaddr *uaddr,
                     int *uaddr_len, int peer)
 {
-        struct tipc_sock *tsock = tipc_sk(sock->sk);
         struct sockaddr_tipc *addr = (struct sockaddr_tipc *)uaddr;
+        u32 portref = tipc_sk_port(sock->sk)->ref;
         u32 res;
 
-        if (down_interruptible(&tsock->sem))
-                return -ERESTARTSYS;
+        if (peer) {
+                res = tipc_peer(portref, &addr->addr.id);
+                if (res)
+                        return res;
+        } else {
+                tipc_ownidentity(portref, &addr->addr.id);
+        }
 
         *uaddr_len = sizeof(*addr);
         addr->addrtype = TIPC_ADDR_ID;
         addr->family = AF_TIPC;
         addr->scope = 0;
-        if (peer)
-                res = tipc_peer(tsock->p->ref, &addr->addr.id);
-        else
-                res = tipc_ownidentity(tsock->p->ref, &addr->addr.id);
         addr->addr.name.domain = 0;
 
-        up(&tsock->sem);
-        return res;
+        return 0;
 }
 
 /**
@@ -390,15 +413,47 @@ static int get_name(struct socket *sock, struct sockaddr *uaddr,
  * @sock: socket for which to calculate the poll bits
  * @wait: ???
  *
- * Returns the pollmask
+ * Returns pollmask value
+ *
+ * COMMENTARY:
+ * It appears that the usual socket locking mechanisms are not useful here
+ * since the pollmask info is potentially out-of-date the moment this routine
+ * exits.  TCP and other protocols seem to rely on higher level poll routines
+ * to handle any preventable race conditions, so TIPC will do the same ...
+ *
+ * TIPC sets the returned events as follows:
+ * a) POLLRDNORM and POLLIN are set if the socket's receive queue is non-empty
+ *    or if a connection-oriented socket is does not have an active connection
+ *    (i.e. a read operation will not block).
+ * b) POLLOUT is set except when a socket's connection has been terminated
+ *    (i.e. a write operation will not block).
+ * c) POLLHUP is set when a socket's connection has been terminated.
+ *
+ * IMPORTANT: The fact that a read or write operation will not block does NOT
+ * imply that the operation will succeed!
  */
 
 static unsigned int poll(struct file *file, struct socket *sock,
                          poll_table *wait)
 {
-        poll_wait(file, sock->sk->sk_sleep, wait);
-        /* NEED LOCK HERE? */
-        return pollmask(sock);
+        struct sock *sk = sock->sk;
+        u32 mask;
+
+        poll_wait(file, sk->sk_sleep, wait);
+
+        if (!skb_queue_empty(&sk->sk_receive_queue) ||
+            (sock->state == SS_UNCONNECTED) ||
+            (sock->state == SS_DISCONNECTING))
+                mask = (POLLRDNORM | POLLIN);
+        else
+                mask = 0;
+
+        if (sock->state == SS_DISCONNECTING)
+                mask |= POLLHUP;
+        else
+                mask |= POLLOUT;
+
+        return mask;
 }
 
 /**
@@ -420,7 +475,6 @@ static int dest_name_check(struct sockaddr_tipc *dest, struct msghdr *m)
                 return 0;
         if (likely(dest->addr.name.name.type == TIPC_TOP_SRV))
                 return 0;
-
         if (likely(dest->addr.name.name.type != TIPC_CFG_SRV))
                 return -EACCES;
 
@@ -434,7 +488,7 @@ static int dest_name_check(struct sockaddr_tipc *dest, struct msghdr *m)
 
 /**
  * send_msg - send message in connectionless manner
- * @iocb: (unused)
+ * @iocb: if NULL, indicates that socket lock is already held
  * @sock: socket structure
  * @m: message to send
  * @total_len: length of message
@@ -450,9 +504,9 @@ static int dest_name_check(struct sockaddr_tipc *dest, struct msghdr *m)
 static int send_msg(struct kiocb *iocb, struct socket *sock,
                     struct msghdr *m, size_t total_len)
 {
-        struct tipc_sock *tsock = tipc_sk(sock->sk);
+        struct sock *sk = sock->sk;
+        struct tipc_port *tport = tipc_sk_port(sk);
         struct sockaddr_tipc *dest = (struct sockaddr_tipc *)m->msg_name;
-        struct sk_buff *buf;
         int needs_conn;
         int res = -EINVAL;
 
@@ -462,48 +516,46 @@ static int send_msg(struct kiocb *iocb, struct socket *sock,
                      (dest->family != AF_TIPC)))
                 return -EINVAL;
 
+        if (iocb)
+                lock_sock(sk);
+
         needs_conn = (sock->state != SS_READY);
         if (unlikely(needs_conn)) {
-                if (sock->state == SS_LISTENING)
-                        return -EPIPE;
-                if (sock->state != SS_UNCONNECTED)
-                        return -EISCONN;
-                if ((tsock->p->published) ||
-                    ((sock->type == SOCK_STREAM) && (total_len != 0)))
-                        return -EOPNOTSUPP;
+                if (sock->state == SS_LISTENING) {
+                        res = -EPIPE;
+                        goto exit;
+                }
+                if (sock->state != SS_UNCONNECTED) {
+                        res = -EISCONN;
+                        goto exit;
+                }
+                if ((tport->published) ||
+                    ((sock->type == SOCK_STREAM) && (total_len != 0))) {
+                        res = -EOPNOTSUPP;
+                        goto exit;
+                }
                 if (dest->addrtype == TIPC_ADDR_NAME) {
-                        tsock->p->conn_type = dest->addr.name.name.type;
-                        tsock->p->conn_instance = dest->addr.name.name.instance;
+                        tport->conn_type = dest->addr.name.name.type;
+                        tport->conn_instance = dest->addr.name.name.instance;
                 }
-        }
-
-        if (down_interruptible(&tsock->sem))
-                return -ERESTARTSYS;
-
-        if (needs_conn) {
 
                 /* Abort any pending connection attempts (very unlikely) */
 
-                while ((buf = skb_dequeue(&sock->sk->sk_receive_queue))) {
-                        tipc_reject_msg(buf, TIPC_ERR_NO_PORT);
-                        atomic_dec(&tipc_queue_size);
-                }
-
-                sock->state = SS_CONNECTING;
+                reject_rx_queue(sk);
         }
 
         do {
                 if (dest->addrtype == TIPC_ADDR_NAME) {
                         if ((res = dest_name_check(dest, m)))
-                                goto exit;
-                        res = tipc_send2name(tsock->p->ref,
+                                break;
+                        res = tipc_send2name(tport->ref,
                                              &dest->addr.name.name,
                                              dest->addr.name.domain,
                                              m->msg_iovlen,
                                              m->msg_iov);
                 }
                 else if (dest->addrtype == TIPC_ADDR_ID) {
-                        res = tipc_send2port(tsock->p->ref,
+                        res = tipc_send2port(tport->ref,
                                              &dest->addr.id,
                                              m->msg_iovlen,
                                              m->msg_iov);
@@ -511,36 +563,43 @@ static int send_msg(struct kiocb *iocb, struct socket *sock,
                 else if (dest->addrtype == TIPC_ADDR_MCAST) {
                         if (needs_conn) {
                                 res = -EOPNOTSUPP;
-                                goto exit;
+                                break;
                         }
                         if ((res = dest_name_check(dest, m)))
-                                goto exit;
-                        res = tipc_multicast(tsock->p->ref,
+                                break;
+                        res = tipc_multicast(tport->ref,
                                              &dest->addr.nameseq,
                                              0,
                                              m->msg_iovlen,
                                              m->msg_iov);
                 }
                 if (likely(res != -ELINKCONG)) {
-exit:
-                        up(&tsock->sem);
-                        return res;
+                        if (needs_conn && (res >= 0)) {
+                                sock->state = SS_CONNECTING;
+                        }
+                        break;
                 }
                 if (m->msg_flags & MSG_DONTWAIT) {
                         res = -EWOULDBLOCK;
-                        goto exit;
-                }
-                if (wait_event_interruptible(*sock->sk->sk_sleep,
-                                             !tsock->p->congested)) {
-                    res = -ERESTARTSYS;
-                    goto exit;
+                        break;
                 }
+                release_sock(sk);
+                res = wait_event_interruptible(*sk->sk_sleep,
+                                               !tport->congested);
+                lock_sock(sk);
+                if (res)
+                        break;
         } while (1);
+
+exit:
+        if (iocb)
+                release_sock(sk);
+        return res;
 }
 
 /**
  * send_packet - send a connection-oriented message
- * @iocb: (unused)
+ * @iocb: if NULL, indicates that socket lock is already held
  * @sock: socket structure
  * @m: message to send
  * @total_len: length of message
@@ -553,7 +612,8 @@ exit:
 static int send_packet(struct kiocb *iocb, struct socket *sock,
                        struct msghdr *m, size_t total_len)
 {
-        struct tipc_sock *tsock = tipc_sk(sock->sk);
+        struct sock *sk = sock->sk;
+        struct tipc_port *tport = tipc_sk_port(sk);
         struct sockaddr_tipc *dest = (struct sockaddr_tipc *)m->msg_name;
         int res;
 
@@ -562,9 +622,8 @@ static int send_packet(struct kiocb *iocb, struct socket *sock,
         if (unlikely(dest))
                 return send_msg(iocb, sock, m, total_len);
 
-        if (down_interruptible(&tsock->sem)) {
-                return -ERESTARTSYS;
-        }
+        if (iocb)
+                lock_sock(sk);
 
         do {
                 if (unlikely(sock->state != SS_CONNECTED)) {
@@ -572,25 +631,28 @@ static int send_packet(struct kiocb *iocb, struct socket *sock,
                                 res = -EPIPE;
                         else
                                 res = -ENOTCONN;
-                        goto exit;
+                        break;
                 }
 
-                res = tipc_send(tsock->p->ref, m->msg_iovlen, m->msg_iov);
+                res = tipc_send(tport->ref, m->msg_iovlen, m->msg_iov);
                 if (likely(res != -ELINKCONG)) {
-exit:
-                        up(&tsock->sem);
-                        return res;
+                        break;
                 }
                 if (m->msg_flags & MSG_DONTWAIT) {
                         res = -EWOULDBLOCK;
-                        goto exit;
-                }
-                if (wait_event_interruptible(*sock->sk->sk_sleep,
-                                             !tsock->p->congested)) {
-                    res = -ERESTARTSYS;
-                    goto exit;
+                        break;
                 }
+                release_sock(sk);
+                res = wait_event_interruptible(*sk->sk_sleep,
+                        (!tport->congested || !tport->connected));
+                lock_sock(sk);
+                if (res)
+                        break;
         } while (1);
+
+        if (iocb)
+                release_sock(sk);
+        return res;
 }
 
 /**
@@ -606,11 +668,11 @@ exit:
  * or errno if no data sent
  */
 
-
 static int send_stream(struct kiocb *iocb, struct socket *sock,
                        struct msghdr *m, size_t total_len)
 {
-        struct tipc_port *tport;
+        struct sock *sk = sock->sk;
+        struct tipc_port *tport = tipc_sk_port(sk);
         struct msghdr my_msg;
         struct iovec my_iov;
         struct iovec *curr_iov;
@@ -622,19 +684,27 @@ static int send_stream(struct kiocb *iocb, struct socket *sock,
         int bytes_sent;
         int res;
 
+        lock_sock(sk);
+
         /* Handle special cases where there is no connection */
 
         if (unlikely(sock->state != SS_CONNECTED)) {
-                if (sock->state == SS_UNCONNECTED)
-                        return send_packet(iocb, sock, m, total_len);
-                else if (sock->state == SS_DISCONNECTING)
-                        return -EPIPE;
-                else
-                        return -ENOTCONN;
+                if (sock->state == SS_UNCONNECTED) {
+                        res = send_packet(NULL, sock, m, total_len);
+                        goto exit;
+                } else if (sock->state == SS_DISCONNECTING) {
+                        res = -EPIPE;
+                        goto exit;
+                } else {
+                        res = -ENOTCONN;
+                        goto exit;
+                }
         }
 
-        if (unlikely(m->msg_name))
-                return -EISCONN;
+        if (unlikely(m->msg_name)) {
+                res = -EISCONN;
+                goto exit;
+        }
 
         /*
          * Send each iovec entry using one or more messages
@@ -652,7 +722,6 @@ 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--) {
@@ -667,10 +736,10 @@ static int send_stream(struct kiocb *iocb, struct socket *sock,
                                 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) {
-                                if (bytes_sent != 0)
+                        if ((res = send_packet(NULL, sock, &my_msg, 0)) < 0) {
+                                if (bytes_sent)
                                         res = bytes_sent;
-                                return res;
+                                goto exit;
                         }
                         curr_left -= bytes_to_send;
                         curr_start += bytes_to_send;
@@ -679,22 +748,23 @@ static int send_stream(struct kiocb *iocb, struct socket *sock,
 
                 curr_iov++;
         }
-
-        return bytes_sent;
+        res = bytes_sent;
+exit:
+        release_sock(sk);
+        return res;
 }
 
 /**
  * auto_connect - complete connection setup to a remote port
  * @sock: socket structure
- * @tsock: TIPC-specific socket structure
  * @msg: peer's response message
  *
  * Returns 0 on success, errno otherwise
  */
 
-static int auto_connect(struct socket *sock, struct tipc_sock *tsock,
-                        struct tipc_msg *msg)
+static int auto_connect(struct socket *sock, struct tipc_msg *msg)
 {
+        struct tipc_port *tport = tipc_sk_port(sock->sk);
         struct tipc_portid peer;
 
         if (msg_errcode(msg)) {
@@ -704,8 +774,8 @@ static int auto_connect(struct socket *sock, struct tipc_sock *tsock,
 
         peer.ref = msg_origport(msg);
         peer.node = msg_orignode(msg);
-        tipc_connect2port(tsock->p->ref, &peer);
-        tipc_set_portimportance(tsock->p->ref, msg_importance(msg));
+        tipc_connect2port(tport->ref, &peer);
+        tipc_set_portimportance(tport->ref, msg_importance(msg));
         sock->state = SS_CONNECTED;
         return 0;
 }
@@ -818,62 +888,54 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg,
 static int recv_msg(struct kiocb *iocb, struct socket *sock,
                     struct msghdr *m, size_t buf_len, int flags)
 {
-        struct tipc_sock *tsock = tipc_sk(sock->sk);
+        struct sock *sk = sock->sk;
+        struct tipc_port *tport = tipc_sk_port(sk);
         struct sk_buff *buf;
         struct tipc_msg *msg;
-        unsigned int q_len;
         unsigned int sz;
         u32 err;
         int res;
 
-        /* Currently doesn't support receiving into multiple iovec entries */
+        /* Catch invalid receive requests */
 
         if (m->msg_iovlen != 1)
-                return -EOPNOTSUPP;
-
-        /* Catch invalid receive attempts */
+                return -EOPNOTSUPP;   /* Don't do multiple iovec entries yet */
 
         if (unlikely(!buf_len))
                 return -EINVAL;
 
-        if (sock->type == SOCK_SEQPACKET) {
-                if (unlikely(sock->state == SS_UNCONNECTED))
-                        return -ENOTCONN;
-                if (unlikely((sock->state == SS_DISCONNECTING) &&
-                             (skb_queue_len(&sock->sk->sk_receive_queue) == 0)))
-                        return -ENOTCONN;
-        }
+        lock_sock(sk);
 
-        /* Look for a message in receive queue; wait if necessary */
-
-        if (unlikely(down_interruptible(&tsock->sem)))
-                return -ERESTARTSYS;
-
-restart:
-        if (unlikely((skb_queue_len(&sock->sk->sk_receive_queue) == 0) &&
-                     (flags & MSG_DONTWAIT))) {
-                res = -EWOULDBLOCK;
+        if (unlikely(sock->state == SS_UNCONNECTED)) {
+                res = -ENOTCONN;
                 goto exit;
         }
 
-        if ((res = wait_event_interruptible(
-                *sock->sk->sk_sleep,
-                ((q_len = skb_queue_len(&sock->sk->sk_receive_queue)) ||
-                 (sock->state == SS_DISCONNECTING))) )) {
-                goto exit;
-        }
+restart:
 
-        /* Catch attempt to receive on an already terminated connection */
-        /* [THIS CHECK MAY OVERLAP WITH AN EARLIER CHECK] */
+        /* Look for a message in receive queue; wait if necessary */
 
-        if (!q_len) {
-                res = -ENOTCONN;
-                goto exit;
+        while (skb_queue_empty(&sk->sk_receive_queue)) {
+                if (sock->state == SS_DISCONNECTING) {
+                        res = -ENOTCONN;
+                        goto exit;
+                }
+                if (flags & MSG_DONTWAIT) {
+                        res = -EWOULDBLOCK;
+                        goto exit;
+                }
+                release_sock(sk);
+                res = wait_event_interruptible(*sk->sk_sleep,
+                        (!skb_queue_empty(&sk->sk_receive_queue) ||
+                         (sock->state == SS_DISCONNECTING)));
+                lock_sock(sk);
+                if (res)
+                        goto exit;
         }
 
-        /* Get access to first message in receive queue */
+        /* Look at first message in receive queue */
 
-        buf = skb_peek(&sock->sk->sk_receive_queue);
+        buf = skb_peek(&sk->sk_receive_queue);
         msg = buf_msg(buf);
         sz = msg_data_sz(msg);
         err = msg_errcode(msg);
@@ -881,14 +943,15 @@ restart:
         /* Complete connection setup for an implied connect */
 
         if (unlikely(sock->state == SS_CONNECTING)) {
-                if ((res = auto_connect(sock, tsock, msg)))
+                res = auto_connect(sock, msg);
+                if (res)
                         goto exit;
         }
 
         /* Discard an empty non-errored message & try again */
 
         if ((!sz) && (!err)) {
-                advance_queue(tsock);
+                advance_rx_queue(sk);
                 goto restart;
         }
 
@@ -898,7 +961,8 @@ restart:
 
         /* Capture ancillary data (optional) */
 
-        if ((res = anc_data_recv(m, msg, tsock->p)))
+        res = anc_data_recv(m, msg, tport);
+        if (res)
                 goto exit;
 
         /* Capture message data (if valid) & compute return value (always) */
@@ -925,12 +989,13 @@ restart:
         /* Consume received message (optional) */
 
         if (likely(!(flags & MSG_PEEK))) {
-                if (unlikely(++tsock->p->conn_unacked >= TIPC_FLOW_CONTROL_WIN))
-                        tipc_acknowledge(tsock->p->ref, tsock->p->conn_unacked);
-                advance_queue(tsock);
+                if ((sock->state != SS_READY) &&
+                    (++tport->conn_unacked >= TIPC_FLOW_CONTROL_WIN))
+                        tipc_acknowledge(tport->ref, tport->conn_unacked);
+                advance_rx_queue(sk);
         }
 exit:
-        up(&tsock->sem);
+        release_sock(sk);
         return res;
 }
 
@@ -950,10 +1015,10 @@ exit:
 static int recv_stream(struct kiocb *iocb, struct socket *sock,
                        struct msghdr *m, size_t buf_len, int flags)
 {
-        struct tipc_sock *tsock = tipc_sk(sock->sk);
+        struct sock *sk = sock->sk;
+        struct tipc_port *tport = tipc_sk_port(sk);
         struct sk_buff *buf;
         struct tipc_msg *msg;
-        unsigned int q_len;
         unsigned int sz;
         int sz_to_copy;
         int sz_copied = 0;
@@ -961,54 +1026,49 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock,
         char __user *crs = m->msg_iov->iov_base;
         unsigned char *buf_crs;
         u32 err;
-        int res;
+        int res = 0;
 
-        /* Currently doesn't support receiving into multiple iovec entries */
+        /* Catch invalid receive attempts */
 
         if (m->msg_iovlen != 1)
-                return -EOPNOTSUPP;
-
-        /* Catch invalid receive attempts */
+                return -EOPNOTSUPP;   /* Don't do multiple iovec entries yet */
 
         if (unlikely(!buf_len))
                 return -EINVAL;
 
-        if (unlikely(sock->state == SS_DISCONNECTING)) {
-                if (skb_queue_len(&sock->sk->sk_receive_queue) == 0)
-                        return -ENOTCONN;
-        } else if (unlikely(sock->state != SS_CONNECTED))
-                return -ENOTCONN;
+        lock_sock(sk);
 
-        /* Look for a message in receive queue; wait if necessary */
-
-        if (unlikely(down_interruptible(&tsock->sem)))
-                return -ERESTARTSYS;
-
-restart:
-        if (unlikely((skb_queue_len(&sock->sk->sk_receive_queue) == 0) &&
-                     (flags & MSG_DONTWAIT))) {
-                res = -EWOULDBLOCK;
+        if (unlikely((sock->state == SS_UNCONNECTED) ||
+                     (sock->state == SS_CONNECTING))) {
+                res = -ENOTCONN;
                 goto exit;
         }
 
-        if ((res = wait_event_interruptible(
-                *sock->sk->sk_sleep,
-                ((q_len = skb_queue_len(&sock->sk->sk_receive_queue)) ||
-                 (sock->state == SS_DISCONNECTING))) )) {
-                goto exit;
-        }
+restart:
 
-        /* Catch attempt to receive on an already terminated connection */
-        /* [THIS CHECK MAY OVERLAP WITH AN EARLIER CHECK] */
+        /* Look for a message in receive queue; wait if necessary */
 
-        if (!q_len) {
-                res = -ENOTCONN;
-                goto exit;
+        while (skb_queue_empty(&sk->sk_receive_queue)) {
+                if (sock->state == SS_DISCONNECTING) {
+                        res = -ENOTCONN;
+                        goto exit;
+                }
+                if (flags & MSG_DONTWAIT) {
+                        res = -EWOULDBLOCK;
+                        goto exit;
+                }
+                release_sock(sk);
+                res = wait_event_interruptible(*sk->sk_sleep,
+                        (!skb_queue_empty(&sk->sk_receive_queue) ||
+                         (sock->state == SS_DISCONNECTING)));
+                lock_sock(sk);
+                if (res)
+                        goto exit;
         }
 
-        /* Get access to first message in receive queue */
+        /* Look at first message in receive queue */
 
-        buf = skb_peek(&sock->sk->sk_receive_queue);
+        buf = skb_peek(&sk->sk_receive_queue);
         msg = buf_msg(buf);
         sz = msg_data_sz(msg);
         err = msg_errcode(msg);
@@ -1016,7 +1076,7 @@ restart:
         /* Discard an empty non-errored message & try again */
 
         if ((!sz) && (!err)) {
-                advance_queue(tsock);
+                advance_rx_queue(sk);
                 goto restart;
         }
 
@@ -1024,7 +1084,8 @@ restart:
 
         if (sz_copied == 0) {
                 set_orig_addr(m, msg);
-                if ((res = anc_data_recv(m, msg, tsock->p)))
+                res = anc_data_recv(m, msg, tport);
+                if (res)
                         goto exit;
         }
 
@@ -1032,7 +1093,7 @@ restart:
 
         if (!err) {
                 buf_crs = (unsigned char *)(TIPC_SKB_CB(buf)->handle);
-                sz = skb_tail_pointer(buf) - buf_crs;
+                sz = (unsigned char *)msg + msg_size(msg) - buf_crs;
 
                 needed = (buf_len - sz_copied);
                 sz_to_copy = (sz <= needed) ? sz : needed;
@@ -1062,35 +1123,37 @@ restart:
         /* Consume received message (optional) */
 
         if (likely(!(flags & MSG_PEEK))) {
-                if (unlikely(++tsock->p->conn_unacked >= TIPC_FLOW_CONTROL_WIN))
-                        tipc_acknowledge(tsock->p->ref, tsock->p->conn_unacked);
-                advance_queue(tsock);
+                if (unlikely(++tport->conn_unacked >= TIPC_FLOW_CONTROL_WIN))
+                        tipc_acknowledge(tport->ref, tport->conn_unacked);
+                advance_rx_queue(sk);
         }
 
         /* Loop around if more data is required */
 
         if ((sz_copied < buf_len)    /* didn't get all requested data */
-            && (flags & MSG_WAITALL) /* ... and need to wait for more */
+            && (!skb_queue_empty(&sock->sk->sk_receive_queue) ||
+                (flags & MSG_WAITALL))
+                                     /* ... and more is ready or required */
             && (!(flags & MSG_PEEK)) /* ... and aren't just peeking at data */
             && (!err)                /* ... and haven't reached a FIN */
             )
                 goto restart;
 
 exit:
-        up(&tsock->sem);
+        release_sock(sk);
         return sz_copied ? sz_copied : res;
 }
 
 /**
- * queue_overloaded - test if queue overload condition exists
+ * rx_queue_full - determine if receive queue can accept another message
+ * @msg: message to be added to queue
  * @queue_size: current size of queue
  * @base: nominal maximum size of queue
- * @msg: message to be added to queue
  *
- * Returns 1 if queue is currently overloaded, 0 otherwise
+ * Returns 1 if queue is unable to accept message, 0 otherwise
  */
 
-static int queue_overloaded(u32 queue_size, u32 base, struct tipc_msg *msg)
+static int rx_queue_full(struct tipc_msg *msg, u32 queue_size, u32 base)
 {
         u32 threshold;
         u32 imp = msg_importance(msg);
@@ -1107,41 +1170,28 @@ static int queue_overloaded(u32 queue_size, u32 base, struct tipc_msg *msg)
         if (msg_connected(msg))
                 threshold *= 4;
 
-        return (queue_size > threshold);
-}
-
-/**
- * async_disconnect - wrapper function used to disconnect port
- * @portref: TIPC port reference (passed as pointer-sized value)
- */
-
-static void async_disconnect(unsigned long portref)
-{
-        tipc_disconnect((u32)portref);
+        return (queue_size >= threshold);
 }
 
 /**
- * dispatch - handle arriving message
- * @tport: TIPC port that received message
+ * filter_rcv - validate incoming message
+ * @sk: socket
  * @buf: message
  *
- * Called with port locked.  Must not take socket lock to avoid deadlock risk.
+ * Enqueues message on receive queue if acceptable; optionally handles
+ * disconnect indication for a connected socket.
+ *
+ * Called with socket lock already taken; port lock may also be taken.
  *
  * Returns TIPC error status code (TIPC_OK if message is not to be rejected)
  */
 
-static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf)
+static u32 filter_rcv(struct sock *sk, struct sk_buff *buf)
 {
+        struct socket *sock = sk->sk_socket;
         struct tipc_msg *msg = buf_msg(buf);
-        struct tipc_sock *tsock = (struct tipc_sock *)tport->usr_handle;
-        struct socket *sock;
         u32 recv_q_len;
 
-        /* Reject message if socket is closing */
-
-        if (!tsock)
-                return TIPC_ERR_NO_PORT;
-
         /* Reject message if it is wrong sort of message for socket */
 
         /*
@@ -1149,7 +1199,7 @@ static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf)
          * "NO PORT" ISN'T REALLY THE RIGHT ERROR CODE, AND THERE MAY
          * BE SECURITY IMPLICATIONS INHERENT IN REJECTING INVALID TRAFFIC
          */
-        sock = tsock->sk.sk_socket;
+
         if (sock->state == SS_READY) {
                 if (msg_connected(msg)) {
                         msg_dbg(msg, "dispatch filter 1\n");
@@ -1192,52 +1242,103 @@ static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf)
 
         /* Reject message if there isn't room to queue it */
 
-        if (unlikely((u32)atomic_read(&tipc_queue_size) >
-                     OVERLOAD_LIMIT_BASE)) {
-                if (queue_overloaded(atomic_read(&tipc_queue_size),
-                                     OVERLOAD_LIMIT_BASE, msg))
+        recv_q_len = (u32)atomic_read(&tipc_queue_size);
+        if (unlikely(recv_q_len >= OVERLOAD_LIMIT_BASE)) {
+                if (rx_queue_full(msg, recv_q_len, OVERLOAD_LIMIT_BASE))
                         return TIPC_ERR_OVERLOAD;
         }
-        recv_q_len = skb_queue_len(&tsock->sk.sk_receive_queue);
-        if (unlikely(recv_q_len > (OVERLOAD_LIMIT_BASE / 2))) {
-                if (queue_overloaded(recv_q_len,
-                                     OVERLOAD_LIMIT_BASE / 2, msg))
+        recv_q_len = skb_queue_len(&sk->sk_receive_queue);
+        if (unlikely(recv_q_len >= (OVERLOAD_LIMIT_BASE / 2))) {
+                if (rx_queue_full(msg, recv_q_len, OVERLOAD_LIMIT_BASE / 2))
                         return TIPC_ERR_OVERLOAD;
         }
 
+        /* Enqueue message (finally!) */
+
+        msg_dbg(msg, "<DISP<: ");
+        TIPC_SKB_CB(buf)->handle = msg_data(msg);
+        atomic_inc(&tipc_queue_size);
+        __skb_queue_tail(&sk->sk_receive_queue, buf);
+
         /* Initiate connection termination for an incoming 'FIN' */
 
         if (unlikely(msg_errcode(msg) && (sock->state == SS_CONNECTED))) {
                 sock->state = SS_DISCONNECTING;
-                /* Note: Use signal since port lock is already taken! */
-                tipc_k_signal((Handler)async_disconnect, tport->ref);
+                tipc_disconnect_port(tipc_sk_port(sk));
         }
 
-        /* Enqueue message (finally!) */
+        if (waitqueue_active(sk->sk_sleep))
+                wake_up_interruptible(sk->sk_sleep);
+        return TIPC_OK;
+}
 
-        msg_dbg(msg,"<DISP<: ");
-        TIPC_SKB_CB(buf)->handle = msg_data(msg);
-        atomic_inc(&tipc_queue_size);
-        skb_queue_tail(&sock->sk->sk_receive_queue, buf);
+/**
+ * backlog_rcv - handle incoming message from backlog queue
+ * @sk: socket
+ * @buf: message
+ *
+ * Caller must hold socket lock, but not port lock.
+ *
+ * Returns 0
+ */
 
-        if (waitqueue_active(sock->sk->sk_sleep))
-                wake_up_interruptible(sock->sk->sk_sleep);
-        return TIPC_OK;
+static int backlog_rcv(struct sock *sk, struct sk_buff *buf)
+{
+        u32 res;
+
+        res = filter_rcv(sk, buf);
+        if (res)
+                tipc_reject_msg(buf, res);
+        return 0;
+}
+
+/**
+ * dispatch - handle incoming message
+ * @tport: TIPC port that received message
+ * @buf: message
+ *
+ * Called with port lock already taken.
+ *
+ * Returns TIPC error status code (TIPC_OK if message is not to be rejected)
+ */
+
+static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf)
+{
+        struct sock *sk = (struct sock *)tport->usr_handle;
+        u32 res;
+
+        /*
+         * Process message if socket is unlocked; otherwise add to backlog queue
+         *
+         * This code is based on sk_receive_skb(), but must be distinct from it
+         * since a TIPC-specific filter/reject mechanism is utilized
+         */
+
+        bh_lock_sock(sk);
+        if (!sock_owned_by_user(sk)) {
+                res = filter_rcv(sk, buf);
+        } else {
+                sk_add_backlog(sk, buf);
+                res = TIPC_OK;
+        }
+        bh_unlock_sock(sk);
+
+        return res;
 }
 
 /**
  * wakeupdispatch - wake up port after congestion
  * @tport: port to wakeup
  *
- * Called with port lock on.
+ * Called with port lock already taken.
  */
 
 static void wakeupdispatch(struct tipc_port *tport)
 {
-        struct tipc_sock *tsock = (struct tipc_sock *)tport->usr_handle;
+        struct sock *sk = (struct sock *)tport->usr_handle;
 
-        if (waitqueue_active(tsock->sk.sk_sleep))
-                wake_up_interruptible(tsock->sk.sk_sleep);
+        if (waitqueue_active(sk->sk_sleep))
+                wake_up_interruptible(sk->sk_sleep);
 }
 
 /**
@@ -1245,7 +1346,7 @@ static void wakeupdispatch(struct tipc_port *tport)
  * @sock: socket structure
  * @dest: socket address for destination port
  * @destlen: size of socket address data structure
- * @flags: (unused)
+ * @flags: file-related flags associated with socket
  *
  * Returns 0 on success, errno otherwise
  */
@@ -1253,72 +1354,105 @@ static void wakeupdispatch(struct tipc_port *tport)
 static int connect(struct socket *sock, struct sockaddr *dest, int destlen,
                    int flags)
 {
-   struct tipc_sock *tsock = tipc_sk(sock->sk);
-   struct sockaddr_tipc *dst = (struct sockaddr_tipc *)dest;
-   struct msghdr m = {NULL,};
-   struct sk_buff *buf;
-   struct tipc_msg *msg;
-   int res;
-
-   /* For now, TIPC does not allow use of connect() with DGRAM or RDM types */
-
-   if (sock->state == SS_READY)
-           return -EOPNOTSUPP;
-
-   /* Issue Posix-compliant error code if socket is in the wrong state */
-
-   if (sock->state == SS_LISTENING)
-           return -EOPNOTSUPP;
-   if (sock->state == SS_CONNECTING)
-           return -EALREADY;
-   if (sock->state != SS_UNCONNECTED)
-           return -EISCONN;
-
-   /*
-    * Reject connection attempt using multicast address
-    *
-    * Note: send_msg() validates the rest of the address fields,
-    *       so there's no need to do it here
-    */
-
-   if (dst->addrtype == TIPC_ADDR_MCAST)
-           return -EINVAL;
-
-   /* Send a 'SYN-' to destination */
-
-   m.msg_name = dest;
-   m.msg_namelen = destlen;
-   if ((res = send_msg(NULL, sock, &m, 0)) < 0) {
-           sock->state = SS_DISCONNECTING;
-           return res;
-   }
-
-   if (down_interruptible(&tsock->sem))
-           return -ERESTARTSYS;
-
-   /* Wait for destination's 'ACK' response */
-
-   res = wait_event_interruptible_timeout(*sock->sk->sk_sleep,
-                                          skb_queue_len(&sock->sk->sk_receive_queue),
-                                          sock->sk->sk_rcvtimeo);
-   buf = skb_peek(&sock->sk->sk_receive_queue);
-   if (res > 0) {
-           msg = buf_msg(buf);
-           res = auto_connect(sock, tsock, msg);
-           if (!res) {
-                   if (!msg_data_sz(msg))
-                           advance_queue(tsock);
-           }
-   } else {
-           if (res == 0) {
-                   res = -ETIMEDOUT;
-           } else
-                   { /* leave "res" unchanged */ }
-           sock->state = SS_DISCONNECTING;
-   }
-
-   up(&tsock->sem);
-   return res;
+        struct sock *sk = sock->sk;
+        struct sockaddr_tipc *dst = (struct sockaddr_tipc *)dest;
+        struct msghdr m = {NULL,};
+        struct sk_buff *buf;
+        struct tipc_msg *msg;
+        int res;
+
+        lock_sock(sk);
+
+        /* For now, TIPC does not allow use of connect() with DGRAM/RDM types */
+
+        if (sock->state == SS_READY) {
+                res = -EOPNOTSUPP;
+                goto exit;
+        }
+
+        /* For now, TIPC does not support the non-blocking form of connect() */
+
+        if (flags & O_NONBLOCK) {
+                res = -EWOULDBLOCK;
+                goto exit;
+        }
+
+        /* Issue Posix-compliant error code if socket is in the wrong state */
+
+        if (sock->state == SS_LISTENING) {
+                res = -EOPNOTSUPP;
+                goto exit;
+        }
+        if (sock->state == SS_CONNECTING) {
+                res = -EALREADY;
+                goto exit;
+        }
+        if (sock->state != SS_UNCONNECTED) {
+                res = -EISCONN;
+                goto exit;
+        }
+
+        /*
+         * Reject connection attempt using multicast address
+         *
+         * Note: send_msg() validates the rest of the address fields,
+         *       so there's no need to do it here
+         */
+
+        if (dst->addrtype == TIPC_ADDR_MCAST) {
+                res = -EINVAL;
+                goto exit;
+        }
+
+        /* Reject any messages already in receive queue (very unlikely) */
+
+        reject_rx_queue(sk);
+
+        /* Send a 'SYN-' to destination */
+
+        m.msg_name = dest;
+        m.msg_namelen = destlen;
+        res = send_msg(NULL, sock, &m, 0);
+        if (res < 0) {
+                goto exit;
+        }
+
+        /* Wait until an 'ACK' or 'RST' arrives, or a timeout occurs */
+
+        release_sock(sk);
+        res = wait_event_interruptible_timeout(*sk->sk_sleep,
+                        (!skb_queue_empty(&sk->sk_receive_queue) ||
+                        (sock->state != SS_CONNECTING)),
+                        sk->sk_rcvtimeo);
+        lock_sock(sk);
+
+        if (res > 0) {
+                buf = skb_peek(&sk->sk_receive_queue);
+                if (buf != NULL) {
+                        msg = buf_msg(buf);
+                        res = auto_connect(sock, msg);
+                        if (!res) {
+                                if (!msg_data_sz(msg))
+                                        advance_rx_queue(sk);
+                        }
+                } else {
+                        if (sock->state == SS_CONNECTED) {
+                                res = -EISCONN;
+                        } else {
+                                res = -ECONNREFUSED;
+                        }
+                }
+        } else {
+                if (res == 0)
+                        res = -ETIMEDOUT;
+                else
+                        ; /* leave "res" unchanged */
+                sock->state = SS_DISCONNECTING;
+        }
+
+exit:
+        release_sock(sk);
+        return res;
 }
 
 /**
@@ -1331,14 +1465,22 @@ static int connect(struct socket *sock, struct sockaddr *dest, int destlen,
 
 static int listen(struct socket *sock, int len)
 {
-        /* REQUIRES SOCKET LOCKING OF SOME SORT? */
+        struct sock *sk = sock->sk;
+        int res;
+
+        lock_sock(sk);
 
         if (sock->state == SS_READY)
-                return -EOPNOTSUPP;
-        if (sock->state != SS_UNCONNECTED)
-                return -EINVAL;
-        sock->state = SS_LISTENING;
-        return 0;
+                res = -EOPNOTSUPP;
+        else if (sock->state != SS_UNCONNECTED)
+                res = -EINVAL;
+        else {
+                sock->state = SS_LISTENING;
+                res = 0;
+        }
+
+        release_sock(sk);
+        return res;
 }
 
 /**
@@ -1350,50 +1492,69 @@ static int listen(struct socket *sock, int len)
  * Returns 0 on success, errno otherwise
  */
 
-static int accept(struct socket *sock, struct socket *newsock, int flags)
+static int accept(struct socket *sock, struct socket *new_sock, int flags)
 {
-        struct tipc_sock *tsock = tipc_sk(sock->sk);
+        struct sock *sk = sock->sk;
         struct sk_buff *buf;
-        int res = -EFAULT;
-
-        if (sock->state == SS_READY)
-                return -EOPNOTSUPP;
-        if (sock->state != SS_LISTENING)
-                return -EINVAL;
-
-        if (unlikely((skb_queue_len(&sock->sk->sk_receive_queue) == 0) &&
-                     (flags & O_NONBLOCK)))
-                return -EWOULDBLOCK;
+        int res;
 
-        if (down_interruptible(&tsock->sem))
-                return -ERESTARTSYS;
+        lock_sock(sk);
 
-        if (wait_event_interruptible(*sock->sk->sk_sleep,
-                                     skb_queue_len(&sock->sk->sk_receive_queue))) {
-                res = -ERESTARTSYS;
+        if (sock->state == SS_READY) {
+                res = -EOPNOTSUPP;
+                goto exit;
+        }
+        if (sock->state != SS_LISTENING) {
+                res = -EINVAL;
                 goto exit;
         }
-        buf = skb_peek(&sock->sk->sk_receive_queue);
 
-        res = tipc_create(sock->sk->sk_net, newsock, 0);
+        while (skb_queue_empty(&sk->sk_receive_queue)) {
+                if (flags & O_NONBLOCK) {
+                        res = -EWOULDBLOCK;
+                        goto exit;
+                }
+                release_sock(sk);
+                res = wait_event_interruptible(*sk->sk_sleep,
+                                (!skb_queue_empty(&sk->sk_receive_queue)));
+                lock_sock(sk);
+                if (res)
+                        goto exit;
+        }
+
+        buf = skb_peek(&sk->sk_receive_queue);
+
+        res = tipc_create(sock_net(sock->sk), new_sock, 0);
         if (!res) {
-                struct tipc_sock *new_tsock = tipc_sk(newsock->sk);
+                struct sock *new_sk = new_sock->sk;
+                struct tipc_port *new_tport = tipc_sk_port(new_sk);
+                u32 new_ref = new_tport->ref;
                 struct tipc_portid id;
                 struct tipc_msg *msg = buf_msg(buf);
-                u32 new_ref = new_tsock->p->ref;
+
+                lock_sock(new_sk);
+
+                /*
+                 * Reject any stray messages received by new socket
+                 * before the socket lock was taken (very, very unlikely)
+                 */
+
+                reject_rx_queue(new_sk);
+
+                /* Connect new socket to it's peer */
 
                 id.ref = msg_origport(msg);
                 id.node = msg_orignode(msg);
                 tipc_connect2port(new_ref, &id);
-                newsock->state = SS_CONNECTED;
+                new_sock->state = SS_CONNECTED;
 
                 tipc_set_portimportance(new_ref, msg_importance(msg));
                 if (msg_named(msg)) {
-                        new_tsock->p->conn_type = msg_nametype(msg);
-                        new_tsock->p->conn_instance = msg_nameinst(msg);
+                        new_tport->conn_type = msg_nametype(msg);
+                        new_tport->conn_instance = msg_nameinst(msg);
                 }
 
-               /*
+                /*
                  * Respond to 'SYN-' by discarding it & returning 'ACK'-.
                  * Respond to 'SYN+' by queuing it on new socket.
                  */
@@ -1402,24 +1563,23 @@ static int accept(struct socket *sock, struct socket *newsock, int flags)
                 if (!msg_data_sz(msg)) {
                         struct msghdr m = {NULL,};
 
-                        send_packet(NULL, newsock, &m, 0);
-                        advance_queue(tsock);
+                        advance_rx_queue(sk);
+                        send_packet(NULL, new_sock, &m, 0);
                 } else {
-                        sock_lock(tsock);
-                        skb_dequeue(&sock->sk->sk_receive_queue);
-                        sock_unlock(tsock);
-                        skb_queue_head(&newsock->sk->sk_receive_queue, buf);
+                        __skb_dequeue(&sk->sk_receive_queue);
+                        __skb_queue_head(&new_sk->sk_receive_queue, buf);
                 }
+                release_sock(new_sk);
         }
 exit:
-        up(&tsock->sem);
+        release_sock(sk);
         return res;
 }
 
 /**
  * shutdown - shutdown socket connection
  * @sock: socket structure
- * @how: direction to close (unused; always treated as read + write)
+ * @how: direction to close (must be SHUT_RDWR)
  *
  * Terminates connection (if necessary), then purges socket's receive queue.
  *
@@ -1428,53 +1588,46 @@ exit:
 
 static int shutdown(struct socket *sock, int how)
 {
-        struct tipc_sock* tsock = tipc_sk(sock->sk);
+        struct sock *sk = sock->sk;
+        struct tipc_port *tport = tipc_sk_port(sk);
         struct sk_buff *buf;
         int res;
 
-        /* Could return -EINVAL for an invalid "how", but why bother? */
-
-        if (down_interruptible(&tsock->sem))
-                return -ERESTARTSYS;
+        if (how != SHUT_RDWR)
+                return -EINVAL;
 
-        sock_lock(tsock);
+        lock_sock(sk);
 
         switch (sock->state) {
+        case SS_CONNECTING:
         case SS_CONNECTED:
 
-                /* Send 'FIN+' or 'FIN-' message to peer */
-
-                sock_unlock(tsock);
+                /* Disconnect and send a 'FIN+' or 'FIN-' message to peer */
 restart:
-                if ((buf = skb_dequeue(&sock->sk->sk_receive_queue))) {
+                buf = __skb_dequeue(&sk->sk_receive_queue);
+                if (buf) {
                         atomic_dec(&tipc_queue_size);
                         if (TIPC_SKB_CB(buf)->handle != msg_data(buf_msg(buf))) {
                                 buf_discard(buf);
                                 goto restart;
                         }
+                        tipc_disconnect(tport->ref);
                         tipc_reject_msg(buf, TIPC_CONN_SHUTDOWN);
+                } else {
+                        tipc_shutdown(tport->ref);
                 }
-                else {
-                        tipc_shutdown(tsock->p->ref);
-                }
-                sock_lock(tsock);
+
+                sock->state = SS_DISCONNECTING;
 
                 /* fall through */
 
         case SS_DISCONNECTING:
 
-                /* Discard any unreceived messages */
+                /* Discard any unreceived messages; wake up sleeping tasks */
 
-                while ((buf = skb_dequeue(&sock->sk->sk_receive_queue))) {
-                        atomic_dec(&tipc_queue_size);
-                        buf_discard(buf);
-                }
-                tsock->p->conn_unacked = 0;
-
-                /* fall through */
-
-        case SS_CONNECTING:
-                sock->state = SS_DISCONNECTING;
+                discard_rx_queue(sk);
+                if (waitqueue_active(sk->sk_sleep))
+                        wake_up_interruptible(sk->sk_sleep);
                 res = 0;
                 break;
 
@@ -1482,9 +1635,7 @@ restart:
                 res = -ENOTCONN;
         }
 
-        sock_unlock(tsock);
-
-        up(&tsock->sem);
+        release_sock(sk);
         return res;
 }
 
@@ -1505,7 +1656,8 @@ restart:
 static int setsockopt(struct socket *sock,
                       int lvl, int opt, char __user *ov, int ol)
 {
-        struct tipc_sock *tsock = tipc_sk(sock->sk);
+        struct sock *sk = sock->sk;
+        struct tipc_port *tport = tipc_sk_port(sk);
         u32 value;
         int res;
 
@@ -1518,30 +1670,31 @@ static int setsockopt(struct socket *sock,
         if ((res = get_user(value, (u32 __user *)ov)))
                 return res;
 
-        if (down_interruptible(&tsock->sem))
-                return -ERESTARTSYS;
+        lock_sock(sk);
 
         switch (opt) {
         case TIPC_IMPORTANCE:
-                res = tipc_set_portimportance(tsock->p->ref, value);
+                res = tipc_set_portimportance(tport->ref, value);
                 break;
         case TIPC_SRC_DROPPABLE:
                 if (sock->type != SOCK_STREAM)
-                        res = tipc_set_portunreliable(tsock->p->ref, value);
+                        res = tipc_set_portunreliable(tport->ref, value);
                 else
                         res = -ENOPROTOOPT;
                 break;
         case TIPC_DEST_DROPPABLE:
-                res = tipc_set_portunreturnable(tsock->p->ref, value);
+                res = tipc_set_portunreturnable(tport->ref, value);
                 break;
         case TIPC_CONN_TIMEOUT:
-                sock->sk->sk_rcvtimeo = (value * HZ / 1000);
+                sk->sk_rcvtimeo = msecs_to_jiffies(value);
+                /* no need to set "res", since already 0 at this point */
                 break;
         default:
                 res = -EINVAL;
         }
 
-        up(&tsock->sem);
+        release_sock(sk);
+
         return res;
 }
 
@@ -1562,7 +1715,8 @@ static int setsockopt(struct socket *sock,
 static int getsockopt(struct socket *sock,
                       int lvl, int opt, char __user *ov, int __user *ol)
 {
-        struct tipc_sock *tsock = tipc_sk(sock->sk);
+        struct sock *sk = sock->sk;
+        struct tipc_port *tport = tipc_sk_port(sk);
         int len;
         u32 value;
         int res;
@@ -1574,26 +1728,28 @@ static int getsockopt(struct socket *sock,
         if ((res = get_user(len, ol)))
                 return res;
 
-        if (down_interruptible(&tsock->sem))
-                return -ERESTARTSYS;
+        lock_sock(sk);
 
         switch (opt) {
         case TIPC_IMPORTANCE:
-                res = tipc_portimportance(tsock->p->ref, &value);
+                res = tipc_portimportance(tport->ref, &value);
                 break;
         case TIPC_SRC_DROPPABLE:
-                res = tipc_portunreliable(tsock->p->ref, &value);
+                res = tipc_portunreliable(tport->ref, &value);
                 break;
         case TIPC_DEST_DROPPABLE:
-                res = tipc_portunreturnable(tsock->p->ref, &value);
+                res = tipc_portunreturnable(tport->ref, &value);
                 break;
         case TIPC_CONN_TIMEOUT:
-                value = (sock->sk->sk_rcvtimeo * 1000) / HZ;
+                value = jiffies_to_msecs(sk->sk_rcvtimeo);
+                /* no need to set "res", since already 0 at this point */
                 break;
         default:
                 res = -EINVAL;
         }
 
+        release_sock(sk);
+
         if (res) {
                 /* "get" failed */
         }
@@ -1607,7 +1763,6 @@ static int getsockopt(struct socket *sock,
                 res = put_user(sizeof(value), ol);
         }
 
-        up(&tsock->sem);
         return res;
 }
 
@@ -1720,6 +1875,7 @@ int tipc_socket_init(void)
 /**
  * tipc_socket_stop - stop TIPC socket interface
  */
+
 void tipc_socket_stop(void)
 {
         if (!sockets_enabled)