|
@@ -999,6 +999,7 @@ static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir)
|
|
|
enum kobj_ns_type type;
|
|
|
const void *ns;
|
|
|
ino_t ino;
|
|
|
+ loff_t off;
|
|
|
|
|
|
type = sysfs_ns_type(parent_sd);
|
|
|
ns = sysfs_info(dentry->d_sb)->ns[type];
|
|
@@ -1021,6 +1022,7 @@ static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir)
|
|
|
return 0;
|
|
|
}
|
|
|
mutex_lock(&sysfs_mutex);
|
|
|
+ off = filp->f_pos;
|
|
|
for (pos = sysfs_dir_pos(ns, parent_sd, filp->f_pos, pos);
|
|
|
pos;
|
|
|
pos = sysfs_dir_next_pos(ns, parent_sd, filp->f_pos, pos)) {
|
|
@@ -1032,19 +1034,24 @@ static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir)
|
|
|
len = strlen(name);
|
|
|
ino = pos->s_ino;
|
|
|
type = dt_type(pos);
|
|
|
- filp->f_pos = pos->s_hash;
|
|
|
+ off = filp->f_pos = pos->s_hash;
|
|
|
filp->private_data = sysfs_get(pos);
|
|
|
|
|
|
mutex_unlock(&sysfs_mutex);
|
|
|
- ret = filldir(dirent, name, len, filp->f_pos, ino, type);
|
|
|
+ ret = filldir(dirent, name, len, off, ino, type);
|
|
|
mutex_lock(&sysfs_mutex);
|
|
|
if (ret < 0)
|
|
|
break;
|
|
|
}
|
|
|
mutex_unlock(&sysfs_mutex);
|
|
|
- if ((filp->f_pos > 1) && !pos) { /* EOF */
|
|
|
- filp->f_pos = INT_MAX;
|
|
|
+
|
|
|
+ /* don't reference last entry if its refcount is dropped */
|
|
|
+ if (!pos) {
|
|
|
filp->private_data = NULL;
|
|
|
+
|
|
|
+ /* EOF and not changed as 0 or 1 in read/write path */
|
|
|
+ if (off == filp->f_pos && off > 1)
|
|
|
+ filp->f_pos = INT_MAX;
|
|
|
}
|
|
|
return 0;
|
|
|
}
|