summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-11-29 22:57:33 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-11-29 23:01:30 -0500
commita77cfcb429ed98845a4e4df72473b8f37acd890b (patch)
tree25a10ee731ab94f0ab4cbcd22414b5faff027768
parent21d8a15ac333b05f1fecdf9fdc30996be2e11d60 (diff)
downloadop-kernel-dev-a77cfcb429ed98845a4e4df72473b8f37acd890b.zip
op-kernel-dev-a77cfcb429ed98845a4e4df72473b8f37acd890b.tar.gz
fix off-by-one in argument passed by iterate_fd() to callbacks
Noticed by Pavel Roskin; the thing in his patch I disagree with was compensating for that shite in callbacks instead of fixing it once in the iterator itself. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/file.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/file.c b/fs/file.c
index 7cb71b9..eff2316 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -994,16 +994,18 @@ int iterate_fd(struct files_struct *files, unsigned n,
const void *p)
{
struct fdtable *fdt;
- struct file *file;
int res = 0;
if (!files)
return 0;
spin_lock(&files->file_lock);
- fdt = files_fdtable(files);
- while (!res && n < fdt->max_fds) {
- file = rcu_dereference_check_fdtable(files, fdt->fd[n++]);
- if (file)
- res = f(p, file, n);
+ for (fdt = files_fdtable(files); n < fdt->max_fds; n++) {
+ struct file *file;
+ file = rcu_dereference_check_fdtable(files, fdt->fd[n]);
+ if (!file)
+ continue;
+ res = f(p, file, n);
+ if (res)
+ break;
}
spin_unlock(&files->file_lock);
return res;
OpenPOWER on IntegriCloud