diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-12 04:47:25 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-12 04:47:25 +0300 |
| commit | 009f773836513960d3982e80c86e266d25528563 (patch) | |
| tree | 7315e5666698997dee34a80c1a1db801d3f8879b /net/core/scm.c | |
| parent | dd0d0d4de582a6a61c032332c91f4f4cb2bab569 (diff) | |
| parent | 6544a1df11c48c8413071aac3316792e4678fbfb (diff) | |
| download | linux-009f773836513960d3982e80c86e266d25528563.tar.xz | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.5 merge window.
Diffstat (limited to 'net/core/scm.c')
| -rw-r--r-- | net/core/scm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/scm.c b/net/core/scm.c index 3b6899b7d810..8a1741b14302 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -305,6 +305,8 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) err = put_user(cmlen, &cm->cmsg_len); if (!err) { cmlen = CMSG_SPACE(i*sizeof(int)); + if (msg->msg_controllen < cmlen) + cmlen = msg->msg_controllen; msg->msg_control += cmlen; msg->msg_controllen -= cmlen; } |