---

yaml --- r: 184041 b: refs/heads/master c: 55d9559 h: refs/heads/master i: 184039: e580cda v: v3
git-mirror · Feb 13, 2010 · 1bc566a · 1bc566a
1 parent 7e36e4c
commit 1bc566a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfc0861ba32643c63901832a583054bea0445961
+refs/heads/master: 55d955902a7f78e3e7c9ddbc71a4a050d9d44810
diff --git a/trunk/net/dccp/proto.c b/trunk/net/dccp/proto.c
@@ -835,6 +835,8 @@ int dccp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 			len = -EFAULT;
 			break;
 		}
+		if (flags & MSG_TRUNC)
+			len = skb->len;
 	found_fin_ok:
 		if (!(flags & MSG_PEEK))
 			sk_eat_skb(sk, skb, 0);