1 files changed, 4 insertions, 2 deletions

diff --git a/net/core/scm.c b/net/core/scm.c
index 3b6899b7d810..14596fb37172 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -289,8 +289,8 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
                 /* Bump the usage count and install the file. */
                 sock = sock_from_file(fp[i], &err);
                 if (sock) {
-                        sock_update_netprioidx(sock->sk);
-                        sock_update_classid(sock->sk);
+                        sock_update_netprioidx(&sock->sk->sk_cgrp_data);
+                        sock_update_classid(&sock->sk->sk_cgrp_data);
                 }
                 fd_install(new_fd, get_file(fp[i]));
         }
@@ -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;
                 }