diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-12 15:47:45 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-12 15:47:45 -0800 |
commit | 8ecba5af948cb58bf6d5eb1537c0df53cbc319c4 (patch) | |
tree | 83775a334c9e4be97b5dbf3f0a1d86854b10c4c1 /net/core/scm.c | |
parent | 2b9b6d8c715b23fa119261c32ad360681f4464a9 (diff) | |
parent | 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39 (diff) |
Merge tag 'v3.8-rc7' into x86/asm
Merge in the updates to head_32.S from the previous urgent branch, as
upcoming patches will make further changes.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'net/core/scm.c')
-rw-r--r-- | net/core/scm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/core/scm.c b/net/core/scm.c index 57fb1ee6649f..905dcc6ad1e3 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -35,6 +35,7 @@ #include <net/sock.h> #include <net/compat.h> #include <net/scm.h> +#include <net/cls_cgroup.h> /* @@ -302,8 +303,10 @@ 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) + if (sock) { sock_update_netprioidx(sock->sk, current); + sock_update_classid(sock->sk, current); + } fd_install(new_fd, get_file(fp[i])); } |