From 8f25f66f5e986fea355670a4e2839038e8c5b7e0 Mon Sep 17 00:00:00 2001
From: John Fastabend <john.r.fastabend@intel.com>
Date: Tue, 14 Aug 2012 12:34:30 +0000
Subject: [PATCH] --- yaml --- r: 322026 b: refs/heads/master c:
 48a87cc26c13b68f6cce4e9d769fcb17a6b3e4b8 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/scm.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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); i<fdmax;
 	     i++, cmfptr++)
 	{
+		struct socket *sock;
 		int new_fd;
 		err = security_file_receive(fp[i]);
 		if (err)
@@ -281,6 +282,9 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
 		}
 		/* Bump the usage count and install the file. */
 		get_file(fp[i]);
+		sock = sock_from_file(fp[i], &err);
+		if (sock)
+			sock_update_netprioidx(sock->sk, current);
 		fd_install(new_fd, fp[i]);
 	}