|
@@ -1483,41 +1483,30 @@ out:
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * d_validate - verify dentry provided from insecure source
|
|
|
|
|
|
+ * d_validate - verify dentry provided from insecure source (deprecated)
|
|
* @dentry: The dentry alleged to be valid child of @dparent
|
|
* @dentry: The dentry alleged to be valid child of @dparent
|
|
* @dparent: The parent dentry (known to be valid)
|
|
* @dparent: The parent dentry (known to be valid)
|
|
*
|
|
*
|
|
* An insecure source has sent us a dentry, here we verify it and dget() it.
|
|
* An insecure source has sent us a dentry, here we verify it and dget() it.
|
|
* This is used by ncpfs in its readdir implementation.
|
|
* This is used by ncpfs in its readdir implementation.
|
|
* Zero is returned in the dentry is invalid.
|
|
* Zero is returned in the dentry is invalid.
|
|
|
|
+ *
|
|
|
|
+ * This function is slow for big directories, and deprecated, do not use it.
|
|
*/
|
|
*/
|
|
-
|
|
|
|
int d_validate(struct dentry *dentry, struct dentry *dparent)
|
|
int d_validate(struct dentry *dentry, struct dentry *dparent)
|
|
{
|
|
{
|
|
- struct hlist_head *base;
|
|
|
|
- struct hlist_node *lhp;
|
|
|
|
-
|
|
|
|
- /* Check whether the ptr might be valid at all.. */
|
|
|
|
- if (!kmem_ptr_validate(dentry_cache, dentry))
|
|
|
|
- goto out;
|
|
|
|
-
|
|
|
|
- if (dentry->d_parent != dparent)
|
|
|
|
- goto out;
|
|
|
|
|
|
+ struct dentry *child;
|
|
|
|
|
|
spin_lock(&dcache_lock);
|
|
spin_lock(&dcache_lock);
|
|
- base = d_hash(dparent, dentry->d_name.hash);
|
|
|
|
- hlist_for_each(lhp,base) {
|
|
|
|
- /* hlist_for_each_entry_rcu() not required for d_hash list
|
|
|
|
- * as it is parsed under dcache_lock
|
|
|
|
- */
|
|
|
|
- if (dentry == hlist_entry(lhp, struct dentry, d_hash)) {
|
|
|
|
|
|
+ list_for_each_entry(child, &dparent->d_subdirs, d_u.d_child) {
|
|
|
|
+ if (dentry == child) {
|
|
__dget_locked(dentry);
|
|
__dget_locked(dentry);
|
|
spin_unlock(&dcache_lock);
|
|
spin_unlock(&dcache_lock);
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
spin_unlock(&dcache_lock);
|
|
spin_unlock(&dcache_lock);
|
|
-out:
|
|
|
|
|
|
+
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(d_validate);
|
|
EXPORT_SYMBOL(d_validate);
|