From 1bc566ab885cb2d5995b3c584afe6e97c32e0815 Mon Sep 17 00:00:00 2001
From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Wed, 10 Feb 2010 20:26:18 +0000
Subject: [PATCH] --- yaml --- r: 184041 b: refs/heads/master c:
 55d955902a7f78e3e7c9ddbc71a4a050d9d44810 h: refs/heads/master i:   184039:
 e580cda0e2416cf2dd59b521bad6088355d09d9f v: v3

---
 [refs]                 | 2 +-
 trunk/net/dccp/proto.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 27dc91dc3a2c..9469753e0f61 100644
--- 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
index 671cd1413d59..85ec1cb7fd41 100644
--- 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);