1 files changed, 51 insertions, 20 deletions

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index a687b30a699c..18aba9e99345 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -34,6 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <net/sock.h>
 #include "core.h"
 #include "msg.h"
 #include "addr.h"
@@ -46,25 +47,50 @@ static unsigned int align(unsigned int i)
         return (i + 3) & ~3u;
 }
 
-void tipc_msg_init(struct tipc_msg *m, u32 user, u32 type, u32 hsize,
-                   u32 destnode)
+/**
+ * tipc_buf_acquire - creates a TIPC message buffer
+ * @size: message size (including TIPC header)
+ *
+ * Returns a new buffer with data pointers set to the specified size.
+ *
+ * NOTE: Headroom is reserved to allow prepending of a data link header.
+ *       There may also be unrequested tailroom present at the buffer's end.
+ */
+struct sk_buff *tipc_buf_acquire(u32 size)
 {
+        struct sk_buff *skb;
+        unsigned int buf_size = (BUF_HEADROOM + size + 3) & ~3u;
+
+        skb = alloc_skb_fclone(buf_size, GFP_ATOMIC);
+        if (skb) {
+                skb_reserve(skb, BUF_HEADROOM);
+                skb_put(skb, size);
+                skb->next = NULL;
+        }
+        return skb;
+}
+
+void tipc_msg_init(struct net *net, struct tipc_msg *m, u32 user, u32 type,
+                   u32 hsize, u32 destnode)
+{
+        struct tipc_net *tn = net_generic(net, tipc_net_id);
+
         memset(m, 0, hsize);
         msg_set_version(m);
         msg_set_user(m, user);
         msg_set_hdr_sz(m, hsize);
         msg_set_size(m, hsize);
-        msg_set_prevnode(m, tipc_own_addr);
+        msg_set_prevnode(m, tn->own_addr);
         msg_set_type(m, type);
         if (hsize > SHORT_H_SIZE) {
-                msg_set_orignode(m, tipc_own_addr);
+                msg_set_orignode(m, tn->own_addr);
                 msg_set_destnode(m, destnode);
         }
 }
 
-struct sk_buff *tipc_msg_create(uint user, uint type, uint hdr_sz,
-                                uint data_sz, u32 dnode, u32 onode,
-                                u32 dport, u32 oport, int errcode)
+struct sk_buff *tipc_msg_create(struct net *net, uint user, uint type,
+                                uint hdr_sz, uint data_sz, u32 dnode,
+                                u32 onode, u32 dport, u32 oport, int errcode)
 {
         struct tipc_msg *msg;
         struct sk_buff *buf;
@@ -74,7 +100,7 @@ struct sk_buff *tipc_msg_create(uint user, uint type, uint hdr_sz,
                 return NULL;
 
         msg = buf_msg(buf);
-        tipc_msg_init(msg, user, type, hdr_sz, dnode);
+        tipc_msg_init(net, msg, user, type, hdr_sz, dnode);
         msg_set_size(msg, hdr_sz + data_sz);
         msg_set_prevnode(msg, onode);
         msg_set_origport(msg, oport);
@@ -170,8 +196,8 @@ err:
  *
  * Returns message data size or errno: -ENOMEM, -EFAULT
  */
-int tipc_msg_build(struct tipc_msg *mhdr, struct msghdr *m, int offset,
-                   int dsz, int pktmax, struct sk_buff_head *list)
+int tipc_msg_build(struct net *net, struct tipc_msg *mhdr, struct msghdr *m,
+                   int offset, int dsz, int pktmax, struct sk_buff_head *list)
 {
         int mhsz = msg_hdr_sz(mhdr);
         int msz = mhsz + dsz;
@@ -191,6 +217,7 @@ int tipc_msg_build(struct tipc_msg *mhdr, struct msghdr *m, int offset,
                 skb = tipc_buf_acquire(msz);
                 if (unlikely(!skb))
                         return -ENOMEM;
+                skb_orphan(skb);
                 __skb_queue_tail(list, skb);
                 skb_copy_to_linear_data(skb, mhdr, mhsz);
                 pktpos = skb->data + mhsz;
@@ -202,8 +229,8 @@ int tipc_msg_build(struct tipc_msg *mhdr, struct msghdr *m, int offset,
         }
 
         /* Prepare reusable fragment header */
-        tipc_msg_init(&pkthdr, MSG_FRAGMENTER, FIRST_FRAGMENT,
-                      INT_H_SIZE, msg_destnode(mhdr));
+        tipc_msg_init(net, &pkthdr, MSG_FRAGMENTER, FIRST_FRAGMENT, INT_H_SIZE,
+                      msg_destnode(mhdr));
         msg_set_size(&pkthdr, pktmax);
         msg_set_fragm_no(&pkthdr, pktno);
 
@@ -211,6 +238,7 @@ int tipc_msg_build(struct tipc_msg *mhdr, struct msghdr *m, int offset,
         skb = tipc_buf_acquire(pktmax);
         if (!skb)
                 return -ENOMEM;
+        skb_orphan(skb);
         __skb_queue_tail(list, skb);
         pktpos = skb->data;
         skb_copy_to_linear_data(skb, &pkthdr, INT_H_SIZE);
@@ -244,6 +272,7 @@ int tipc_msg_build(struct tipc_msg *mhdr, struct msghdr *m, int offset,
                         rc = -ENOMEM;
                         goto error;
                 }
+                skb_orphan(skb);
                 __skb_queue_tail(list, skb);
                 msg_set_type(&pkthdr, FRAGMENT);
                 msg_set_size(&pkthdr, pktsz);
@@ -312,8 +341,8 @@ bool tipc_msg_bundle(struct sk_buff_head *list, struct sk_buff *skb, u32 mtu)
  * Replaces buffer if successful
  * Returns true if success, otherwise false
  */
-bool tipc_msg_make_bundle(struct sk_buff_head *list, struct sk_buff *skb,
-                          u32 mtu, u32 dnode)
+bool tipc_msg_make_bundle(struct net *net, struct sk_buff_head *list,
+                          struct sk_buff *skb, u32 mtu, u32 dnode)
 {
         struct sk_buff *bskb;
         struct tipc_msg *bmsg;
@@ -336,7 +365,7 @@ bool tipc_msg_make_bundle(struct sk_buff_head *list, struct sk_buff *skb,
 
         skb_trim(bskb, INT_H_SIZE);
         bmsg = buf_msg(bskb);
-        tipc_msg_init(bmsg, MSG_BUNDLER, 0, INT_H_SIZE, dnode);
+        tipc_msg_init(net, bmsg, MSG_BUNDLER, 0, INT_H_SIZE, dnode);
         msg_set_seqno(bmsg, msg_seqno(msg));
         msg_set_ack(bmsg, msg_ack(msg));
         msg_set_bcast_ack(bmsg, msg_bcast_ack(msg));
@@ -353,8 +382,10 @@ bool tipc_msg_make_bundle(struct sk_buff_head *list, struct sk_buff *skb,
  * Consumes buffer if failure
  * Returns true if success, otherwise false
  */
-bool tipc_msg_reverse(struct sk_buff *buf, u32 *dnode, int err)
+bool tipc_msg_reverse(struct net *net, struct sk_buff *buf, u32 *dnode,
+                      int err)
 {
+        struct tipc_net *tn = net_generic(net, tipc_net_id);
         struct tipc_msg *msg = buf_msg(buf);
         uint imp = msg_importance(msg);
         struct tipc_msg ohdr;
@@ -374,7 +405,7 @@ bool tipc_msg_reverse(struct sk_buff *buf, u32 *dnode, int err)
         msg_set_errcode(msg, err);
         msg_set_origport(msg, msg_destport(&ohdr));
         msg_set_destport(msg, msg_origport(&ohdr));
-        msg_set_prevnode(msg, tipc_own_addr);
+        msg_set_prevnode(msg, tn->own_addr);
         if (!msg_short(msg)) {
                 msg_set_orignode(msg, msg_destnode(&ohdr));
                 msg_set_destnode(msg, msg_orignode(&ohdr));
@@ -399,7 +430,7 @@ exit:
  * Returns 0 (TIPC_OK) if message ok and we can try again, -TIPC error
  * code if message to be rejected
  */
-int tipc_msg_eval(struct sk_buff *buf, u32 *dnode)
+int tipc_msg_eval(struct net *net, struct sk_buff *buf, u32 *dnode)
 {
         struct tipc_msg *msg = buf_msg(buf);
         u32 dport;
@@ -413,8 +444,8 @@ int tipc_msg_eval(struct sk_buff *buf, u32 *dnode)
         if (msg_reroute_cnt(msg) > 0)
                 return -TIPC_ERR_NO_NAME;
 
-        *dnode = addr_domain(msg_lookup_scope(msg));
-        dport = tipc_nametbl_translate(msg_nametype(msg),
+        *dnode = addr_domain(net, msg_lookup_scope(msg));
+        dport = tipc_nametbl_translate(net, msg_nametype(msg),
                                        msg_nameinst(msg),
                                        dnode);
         if (!dport)