diff --git a/[refs] b/[refs] index 247e81f2924e..f245ced99ebd 100644 --- 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 index 0337e2b76862..368f9c3f9dc6 100644 --- 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; }