mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-06 01:05:11 +00:00
73 lines
2.5 KiB
Diff
73 lines
2.5 KiB
Diff
Index: linux-2.6/include/linux/dcache.h
|
|
===================================================================
|
|
--- linux-2.6.orig/include/linux/dcache.h
|
|
+++ linux-2.6/include/linux/dcache.h
|
|
@@ -293,6 +293,8 @@ extern struct dentry * d_hash_and_lookup
|
|
/* validate "insecure" dentry pointer */
|
|
extern int d_validate(struct dentry *, struct dentry *);
|
|
|
|
+extern char *__d_path(struct dentry *, struct vfsmount *, struct dentry *,
|
|
+ struct vfsmount *, char *, int, int);
|
|
extern char * d_path(struct dentry *, struct vfsmount *, char *, int);
|
|
|
|
/* Allocation counts.. */
|
|
Index: linux-2.6/fs/dcache.c
|
|
===================================================================
|
|
--- linux-2.6.orig/fs/dcache.c
|
|
+++ linux-2.6/fs/dcache.c
|
|
@@ -1747,9 +1747,9 @@ shouldnt_be_hashed:
|
|
*
|
|
* Returns the buffer or an error code.
|
|
*/
|
|
-static char *__d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
|
|
- struct dentry *root, struct vfsmount *rootmnt,
|
|
- char *buffer, int buflen, int fail_deleted)
|
|
+char *__d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
|
|
+ struct dentry *root, struct vfsmount *rootmnt,
|
|
+ char *buffer, int buflen, int fail_deleted)
|
|
{
|
|
char *end = buffer + buflen - 1;
|
|
int namelen;
|
|
Index: linux-2.6/fs/namespace.c
|
|
===================================================================
|
|
--- linux-2.6.orig/fs/namespace.c
|
|
+++ linux-2.6/fs/namespace.c
|
|
@@ -1878,3 +1878,25 @@ void __put_mnt_ns(struct mnt_namespace *
|
|
release_mounts(&umount_list);
|
|
kfree(ns);
|
|
}
|
|
+
|
|
+char *d_namespace_path(struct dentry *dentry, struct vfsmount *vfsmnt,
|
|
+ char *buf, int buflen, int fail_deleted)
|
|
+{
|
|
+ char *res;
|
|
+ struct vfsmount *rootmnt, *nsrootmnt;
|
|
+ struct dentry *root;
|
|
+
|
|
+ read_lock(¤t->fs->lock);
|
|
+ rootmnt = mntget(current->fs->rootmnt);
|
|
+ read_unlock(¤t->fs->lock);
|
|
+ spin_lock(&vfsmount_lock);
|
|
+ nsrootmnt = mntget(rootmnt->mnt_ns->root);
|
|
+ root = dget(nsrootmnt->mnt_root);
|
|
+ spin_unlock(&vfsmount_lock);
|
|
+ mntput(rootmnt);
|
|
+ res = __d_path(dentry, vfsmnt, root, rootmnt, buf, buflen, 0);
|
|
+ dput(root);
|
|
+ mntput(nsrootmnt);
|
|
+ return res;
|
|
+}
|
|
+EXPORT_SYMBOL(d_namespace_path);
|
|
Index: linux-2.6/include/linux/mount.h
|
|
===================================================================
|
|
--- linux-2.6.orig/include/linux/mount.h
|
|
+++ linux-2.6/include/linux/mount.h
|
|
@@ -97,5 +97,7 @@ extern void shrink_submounts(struct vfsm
|
|
extern spinlock_t vfsmount_lock;
|
|
extern dev_t name_to_dev_t(char *name);
|
|
|
|
+extern char *d_namespace_path(struct dentry *, struct vfsmount *, char *, int, int);
|
|
+
|
|
#endif
|
|
#endif /* _LINUX_MOUNT_H */
|