From e52baa794a83230217c375bc320eb7f596107918 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Tue, 15 Apr 2008 00:15:15 -0700
Subject: [PATCH] --- yaml --- r: 90725 b: refs/heads/master c:
 7a8036c2b93c8301afce8f75ac099c347bad569d h: refs/heads/master i:   90723:
 3a385f4b960a34a2ad3eeaee90cf8d38714f3f99 v: v3

---
 [refs]                  | 2 +-
 trunk/net/tipc/socket.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 44185730111c..1ab47862e57c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a198d3a200313bca8261e30e6daaad790937fd7e
+refs/heads/master: 7a8036c2b93c8301afce8f75ac099c347bad569d
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
index c1a199c0fa6d..ead22e5eed32 100644
--- a/trunk/net/tipc/socket.c
+++ b/trunk/net/tipc/socket.c
@@ -1027,7 +1027,7 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock,
 
 	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;