1 files changed, 2 insertions, 1 deletions

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 368f9c3f9dc6..99c4f525b1d9 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -187,7 +187,8 @@ 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 && skb->len) {
+                                if (*off >= skb->len && (skb->len || *off ||
+                                                         skb->peeked)) {
                                         *off -= skb->len;
                                         continue;
                                 }