diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-11-25 12:50:56 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-11-25 12:50:56 +0800 |
| commit | 5497d2d7d543b4b8854700d47a175e157fecbfd1 (patch) | |
| tree | b8453c3e27a46e4322cc7749d4b0a209e8476a92 /net/socket.c | |
| parent | 063181a4658b16e6bc0efe24671d5db3097342a4 (diff) | |
| parent | 4eb9a81002485a7abfa53a334dde5bc10328079f (diff) | |
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
Conflicts:
keep check_object_size in copy_from_user
in arch/sparc/include/asm/uaccess_64.h
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 263b334ec5e4..0090225eeb1e 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2041,6 +2041,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); |