From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Fastabend Subject: [net PATCH v1 2/2] net: netprio: fd passed in SCM_RIGHTS datagram not set correctly Date: Mon, 13 Aug 2012 18:39:45 -0700 Message-ID: <20120814013944.3144.53854.stgit@jf-dev1-dcblab> References: <20120814013939.3144.13167.stgit@jf-dev1-dcblab> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, davem@davemloft.net, linux-kernel@vger.kernel.org, joe@perches.com To: viro@ZenIV.linux.org.uk, nhorman@tuxdriver.com Return-path: Received: from mga01.intel.com ([192.55.52.88]:59183 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750724Ab2HNBzl (ORCPT ); Mon, 13 Aug 2012 21:55:41 -0400 In-Reply-To: <20120814013939.3144.13167.stgit@jf-dev1-dcblab> Sender: netdev-owner@vger.kernel.org List-ID: A socket fd passed in a SCM_RIGHTS datagram was not getting updated with the new tasks cgrp prioidx. This leaves IO on the socket tagged with the old tasks priority. To fix this add a check in the scm recvmsg path to update the sock cgrp prioidx with the new tasks value. Thanks to Al Viro for catching this. CC: Neil Horman Reported-by: Al Viro Signed-off-by: John Fastabend --- net/core/scm.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/net/core/scm.c b/net/core/scm.c index 8f6ccfd..053bd43 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -249,6 +249,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) struct file **fp = scm->fp->fp; int __user *cmfptr; int err = 0, i; + __u32 prioidx = task_netprioidx(current); if (MSG_CMSG_COMPAT & msg->msg_flags) { scm_detach_fds_compat(msg, scm); @@ -265,6 +266,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); isk->sk_cgrp_prioidx = prioidx; } if (i > 0)