diff options
| author | Todd Kjos <tkjos@google.com> | 2017-02-23 11:37:18 -0800 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2017-02-23 11:37:18 -0800 |
| commit | f048326ea40e536804e8559948ac6e61d9356f21 (patch) | |
| tree | a21b4123e9da1ab72eeeada954e2fd448d4395ea /net/socket.c | |
| parent | 880c68e41dd2eab7bdbc64c8061e5b7e0e269cd3 (diff) | |
| parent | 232c28fe23b88e7027c6a20965d6e78421a40532 (diff) | |
Merge branch 'android-4.4.y' into android-4.4
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c index 29c20061704e..1f69e48b1501 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2055,6 +2055,8 @@ int __sys_sendmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen, if (err) break; ++datagrams; + if (msg_data_left(&msg_sys)) + break; } fput_light(sock->file, fput_needed); |