From 273b5730a34139ad4607033a4ed2bbbeb31a3e40 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Thu, 4 Aug 2011 14:07:39 +0000
Subject: [PATCH] --- yaml --- r: 262483 b: refs/heads/master c:
 98382f419f32d2c12d021943b87dea555677144b h: refs/heads/master i:   262481:
 42254cb8262884332cf12ff5582c13625d5ae63e   262479:
 5bdac3d0edd487120ceb8051e57ffacc5d51da24 v: v3

---
 [refs]             | 2 +-
 trunk/net/socket.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9c86d9c99f58..889556c77b05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 728ffb86f10873aaf4abd26dde691ee40ae731fe
+refs/heads/master: 98382f419f32d2c12d021943b87dea555677144b
diff --git a/trunk/net/socket.c b/trunk/net/socket.c
index e4ed2359eb43..b5c6de4f268a 100644
--- a/trunk/net/socket.c
+++ b/trunk/net/socket.c
@@ -1999,6 +1999,9 @@ int __sys_sendmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
 	struct compat_mmsghdr __user *compat_entry;
 	struct msghdr msg_sys;
 
+	if (vlen > UIO_MAXIOV)
+		vlen = UIO_MAXIOV;
+
 	datagrams = 0;
 
 	sock = sockfd_lookup_light(fd, &err, &fput_needed);