From patchwork Tue Aug 14 01:39:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Fastabend X-Patchwork-Id: 177150 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9395E2C008B for ; Tue, 14 Aug 2012 11:56:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754423Ab2HNBzg (ORCPT ); Mon, 13 Aug 2012 21:55:36 -0400 Received: from mga02.intel.com ([134.134.136.20]:42206 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750724Ab2HNBzf (ORCPT ); Mon, 13 Aug 2012 21:55:35 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 13 Aug 2012 18:55:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.77,763,1336374000"; d="scan'208";a="185987853" Received: from unknown (HELO [127.0.0.1]) ([10.23.155.170]) by orsmga002.jf.intel.com with ESMTP; 13 Aug 2012 18:55:34 -0700 From: John Fastabend Subject: [net PATCH v1 1/2] net: netprio: fix files lock and remove useless d_path bits To: viro@ZenIV.linux.org.uk, nhorman@tuxdriver.com Cc: netdev@vger.kernel.org, davem@davemloft.net, linux-kernel@vger.kernel.org, joe@perches.com Date: Mon, 13 Aug 2012 18:39:39 -0700 Message-ID: <20120814013939.3144.13167.stgit@jf-dev1-dcblab> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add lock to prevent a race with a file closing and also remove useless and ugly sscanf code. The extra code was never needed and the case it supposedly protected against is in fact handled correctly by sock_from_file as pointed out by Al Viro. CC: Neil Horman Reported-by: Al Viro Signed-off-by: John Fastabend --- net/core/netprio_cgroup.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c index ed0c043..0323ec3 100644 --- a/net/core/netprio_cgroup.c +++ b/net/core/netprio_cgroup.c @@ -296,29 +296,22 @@ void net_prio_attach(struct cgroup *cgrp, struct cgroup_taskset *tset) continue; } - rcu_read_lock(); + spin_lock(&files->file_lock); fdt = files_fdtable(files); for (fd = 0; fd < fdt->max_fds; fd++) { - char *path; struct file *file; struct socket *sock; - unsigned long s; - int rv, err = 0; + int err; file = fcheck_files(files, fd); if (!file) continue; - path = d_path(&file->f_path, tmp, PAGE_SIZE); - rv = sscanf(path, "socket:[%lu]", &s); - if (rv <= 0) - continue; - sock = sock_from_file(file, &err); - if (!err) + if (sock) sock_update_netprioidx(sock->sk, p); } - rcu_read_unlock(); + spin_unlock(&files->file_lock); task_unlock(p); } kfree(tmp);