| Date | Wed, 01 Jun 2011 17:09:38 +0900 | From | Greg KH <> | Subject | [008/165] net: recvmmsg: Strip MSG_WAITFORONE when calling recvmsg |
| |
2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------ Content-Length: 1333 Lines: 44
From: Anton Blanchard <anton@samba.org>
commit b9eb8b8752804cecbacdb4d24b52e823cf07f107 upstream.
recvmmsg fails on a raw socket with EINVAL. The reason for this is packet_recvmsg checks the incoming flags:
err = -EINVAL; if (flags & ~(MSG_PEEK|MSG_DONTWAIT|MSG_TRUNC|MSG_CMSG_COMPAT|MSG_ERRQUEUE)) goto out;
This patch strips out MSG_WAITFORONE when calling recvmmsg which fixes the issue.
Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- net/socket.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
--- a/net/socket.c +++ b/net/socket.c @@ -2122,14 +2122,16 @@ int __sys_recvmmsg(int fd, struct mmsghd */ if (MSG_CMSG_COMPAT & flags) { err = __sys_recvmsg(sock, (struct msghdr __user *)compat_entry, - &msg_sys, flags, datagrams); + &msg_sys, flags & ~MSG_WAITFORONE, + datagrams); if (err < 0) break; err = __put_user(err, &compat_entry->msg_len); ++compat_entry; } else { err = __sys_recvmsg(sock, (struct msghdr __user *)entry, - &msg_sys, flags, datagrams); + &msg_sys, flags & ~MSG_WAITFORONE, + datagrams); if (err < 0) break; err = put_user(err, &entry->msg_len);
|