diff --git a/[refs] b/[refs] index aecca9e53861..7e5737d58527 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f796c20cf67aa54c9130d0dc41307c0025719b85 +refs/heads/master: 48a87cc26c13b68f6cce4e9d769fcb17a6b3e4b8 diff --git a/trunk/net/core/scm.c b/trunk/net/core/scm.c index 8f6ccfd68ef4..040cebeed45b 100644 --- a/trunk/net/core/scm.c +++ b/trunk/net/core/scm.c @@ -265,6 +265,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); isk, current); fd_install(new_fd, fp[i]); }