Re: [net PATCH v1 1/2] net: netprio: fix files lock and remove useless d_path bits
On 8/13/2012 7:29 PM, Al Viro wrote: On Mon, Aug 13, 2012 at 06:39:39PM -0700, John Fastabend wrote: - path = d_path(>f_path, tmp, PAGE_SIZE); What's using tmp after that patch and do you still need to bother allocating it? nothing removed it in v2. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [net PATCH v1 1/2] net: netprio: fix files lock and remove useless d_path bits
On Mon, Aug 13, 2012 at 06:39:39PM -0700, John Fastabend wrote: > - path = d_path(>f_path, tmp, PAGE_SIZE); What's using tmp after that patch and do you still need to bother allocating it? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[net PATCH v1 1/2] net: netprio: fix files lock and remove useless d_path bits
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(-)
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(>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(>f_path, tmp, PAGE_SIZE);
- rv = sscanf(path, "socket:[%lu]", );
- if (rv <= 0)
- continue;
-
sock = sock_from_file(file, );
- if (!err)
+ if (sock)
sock_update_netprioidx(sock->sk, p);
}
- rcu_read_unlock();
+ spin_unlock(>file_lock);
task_unlock(p);
}
kfree(tmp);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[net PATCH v1 1/2] net: netprio: fix files lock and remove useless d_path bits
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 nhor...@tuxdriver.com
Reported-by: Al Viro v...@zeniv.linux.org.uk
Signed-off-by: John Fastabend john.r.fastab...@intel.com
---
net/core/netprio_cgroup.c | 15 ---
1 files changed, 4 insertions(+), 11 deletions(-)
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);
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [net PATCH v1 1/2] net: netprio: fix files lock and remove useless d_path bits
On Mon, Aug 13, 2012 at 06:39:39PM -0700, John Fastabend wrote: - path = d_path(file-f_path, tmp, PAGE_SIZE); What's using tmp after that patch and do you still need to bother allocating it? -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [net PATCH v1 1/2] net: netprio: fix files lock and remove useless d_path bits
On 8/13/2012 7:29 PM, Al Viro wrote: On Mon, Aug 13, 2012 at 06:39:39PM -0700, John Fastabend wrote: - path = d_path(file-f_path, tmp, PAGE_SIZE); What's using tmp after that patch and do you still need to bother allocating it? nothing removed it in v2. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
