---

yaml --- r: 90725 b: refs/heads/master c: 7a8036c h: refs/heads/master i: 90723: 3a385f4 v: v3
git-mirror · Apr 15, 2008 · e52baa7 · e52baa7
1 parent 6ba15f8
commit e52baa7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;