Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753792Ab2HOKxr (ORCPT ); Wed, 15 Aug 2012 06:53:47 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:39323 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751299Ab2HOKxp (ORCPT ); Wed, 15 Aug 2012 06:53:45 -0400 Date: Wed, 15 Aug 2012 06:53:40 -0400 From: Neil Horman To: John Fastabend Cc: viro@ZenIV.linux.org.uk, netdev@vger.kernel.org, davem@davemloft.net, linux-kernel@vger.kernel.org, joe@perches.com Subject: Re: [net PATCH v3 2/3] net: netprio: fd passed in SCM_RIGHTS datagram not set correctly Message-ID: <20120815105340.GB23811@hmsreliant.think-freely.org> References: <20120814223424.3551.21608.stgit@jf-dev1-dcblab> <20120814223430.3551.88909.stgit@jf-dev1-dcblab> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120814223430.3551.88909.stgit@jf-dev1-dcblab> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Score: -2.9 (--) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1661 Lines: 50 On Tue, Aug 14, 2012 at 03:34:30PM -0700, John Fastabend wrote: > 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 | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/net/core/scm.c b/net/core/scm.c > index 8f6ccfd..040cebe 100644 > --- a/net/core/scm.c > +++ b/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 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]); > } > > > Acked-by: Neil Horman -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/