udp/recvmsg: Clear MSG_TRUNC flag when starting over for a new packet
authorXufeng Zhang <xufeng.zhang@windriver.com>
Tue, 21 Jun 2011 10:43:40 +0000 (10:43 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Jun 2011 05:34:27 +0000 (22:34 -0700)
Consider this scenario: When the size of the first received udp packet
is bigger than the receive buffer, MSG_TRUNC bit is set in msg->msg_flags.
However, if checksum error happens and this is a blocking socket, it will
goto try_again loop to receive the next packet.  But if the size of the
next udp packet is smaller than receive buffer, MSG_TRUNC flag should not
be set, but because MSG_TRUNC bit is not cleared in msg->msg_flags before
receive the next packet, MSG_TRUNC is still set, which is wrong.

Fix this problem by clearing MSG_TRUNC flag when starting over for a
new packet.

Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/udp.c
net/ipv6/udp.c

index abca870d8ff69fe76a19bef7d9338d4f80fabaf0..48cd88e625539cb7b94b34747233d57c1543bcee 100644 (file)
@@ -1249,6 +1249,9 @@ csum_copy_err:
 
        if (noblock)
                return -EAGAIN;
+
+       /* starting over for a new packet */
+       msg->msg_flags &= ~MSG_TRUNC;
        goto try_again;
 }
 
index 1e7a43f500ab5fac6a1f5d97af09aa49fd2c5249..328985c408838ad9e50fb1e209cc4f9c592a56a3 100644 (file)
@@ -455,6 +455,9 @@ csum_copy_err:
 
        if (noblock)
                return -EAGAIN;
+
+       /* starting over for a new packet */
+       msg->msg_flags &= ~MSG_TRUNC;
        goto try_again;
 }