Merge branch 'tipc'

Jon Maloy says:

====================
Some small and relatively straightforward patches. With exception of
the two first ones they are all unrelated and address minor issues.

v2: update of v1 (http://patchwork.ozlabs.org/patch/277404/)

-added commit to use memcpy_fromiovec on user data as per v1 feedback
-updated sparse fix commit to drop chunks covered by above commit
-added new commit that greatly simplifies the link lookup routine
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 16 deletions

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index ced60e2fc4f7..e525f8ce1dee 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -73,13 +73,13 @@ void tipc_msg_init(struct tipc_msg *m, u32 user, u32 type, u32 hsize,
  * Returns message data size or errno
  */
 int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect,
-                   u32 num_sect, unsigned int total_len, int max_size,
-                   struct sk_buff **buf)
+                   unsigned int len, int max_size, struct sk_buff **buf)
 {
-        int dsz, sz, hsz, pos, res, cnt;
+        int dsz, sz, hsz;
+        unsigned char *to;
 
-        dsz = total_len;
-        pos = hsz = msg_hdr_sz(hdr);
+        dsz = len;
+        hsz = msg_hdr_sz(hdr);
         sz = hsz + dsz;
         msg_set_size(hdr, sz);
         if (unlikely(sz > max_size)) {
@@ -91,16 +91,11 @@ int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect,
         if (!(*buf))
                 return -ENOMEM;
         skb_copy_to_linear_data(*buf, hdr, hsz);
-        for (res = 1, cnt = 0; res && (cnt < num_sect); cnt++) {
-                skb_copy_to_linear_data_offset(*buf, pos,
-                                               msg_sect[cnt].iov_base,
-                                               msg_sect[cnt].iov_len);
-                pos += msg_sect[cnt].iov_len;
+        to = (*buf)->data + hsz;
+        if (len && memcpy_fromiovecend(to, msg_sect, 0, dsz)) {
+                kfree_skb(*buf);
+                *buf = NULL;
+                return -EFAULT;
         }
-        if (likely(res))
-                return dsz;
-
-        kfree_skb(*buf);
-        *buf = NULL;
-        return -EFAULT;
+        return dsz;
 }