---

yaml --- r: 349751 b: refs/heads/master c: 77c1090 h: refs/heads/master i: 349749: 1c29487 349747: 6a456c9 349743: 66a3921 v: v3
git-mirror · Feb 12, 2013 · 7e7928b · 7e7928b
1 parent ec5ec05
commit 7e7928b
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: 1bf014e5c2d8e62ae11a5a8f70dc679f5d0787eb
+refs/heads/master: 77c1090f94d1b0b5186fb13a1b71b47b1343f87f
diff --git a/trunk/net/core/datagram.c b/trunk/net/core/datagram.c
@@ -187,7 +187,7 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
 		skb_queue_walk(queue, skb) {
 			*peeked = skb->peeked;
 			if (flags & MSG_PEEK) {
-				if (*off >= skb->len) {
+				if (*off >= skb->len && skb->len) {
 					*off -= skb->len;
 					continue;
 				}