mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-05 08:45:22 +00:00
115 lines
3.8 KiB
Diff
115 lines
3.8 KiB
Diff
From: John Johansen <jjohansen@suse.de>
|
|
Subject: Fix __d_path to allow for old and new behavior bnc#380763
|
|
|
|
Fix __d_path so that it can be told whether or not to connect
|
|
disconnect path to the root. This is easier and more efficient
|
|
than trying to reconnect these paths for d_path and get_cwd
|
|
after the fact.
|
|
|
|
Signed-off-by: John Johansen <jjohansen@suse.de>
|
|
|
|
---
|
|
fs/dcache.c | 25 +++++++------------------
|
|
fs/namespace.c | 2 +-
|
|
include/linux/dcache.h | 2 +-
|
|
3 files changed, 9 insertions(+), 20 deletions(-)
|
|
|
|
--- a/fs/dcache.c
|
|
+++ b/fs/dcache.c
|
|
@@ -1772,6 +1772,7 @@ shouldnt_be_hashed:
|
|
* @buffer: buffer to return value in
|
|
* @buflen: buffer length
|
|
* @fail_deleted: what to return for deleted files
|
|
+ * @disconnect: don't return a path starting with / when disconnected
|
|
*
|
|
* Convert a dentry into an ASCII path name. If the entry has been deleted,
|
|
* then if @fail_deleted is true, ERR_PTR(-ENOENT) is returned. Otherwise,
|
|
@@ -1784,7 +1785,7 @@ shouldnt_be_hashed:
|
|
*/
|
|
char *__d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
|
|
struct dentry *root, struct vfsmount *rootmnt,
|
|
- char *buffer, int buflen, int fail_deleted)
|
|
+ char *buffer, int buflen, int fail_deleted, int disconnect)
|
|
{
|
|
int namelen, is_slash, vfsmount_locked = 0;
|
|
|
|
@@ -1848,7 +1849,7 @@ global_root:
|
|
*/
|
|
namelen = dentry->d_name.len;
|
|
is_slash = (namelen == 1 && *dentry->d_name.name == '/');
|
|
- if (is_slash || (dentry->d_sb->s_flags & MS_NOUSER)) {
|
|
+ if (disconnect && (is_slash || (dentry->d_sb->s_flags & MS_NOUSER))) {
|
|
/*
|
|
* Make sure we won't return a pathname starting with '/'.
|
|
*
|
|
@@ -1863,6 +1864,8 @@ global_root:
|
|
}
|
|
if (is_slash)
|
|
goto out;
|
|
+ } else if (is_slash && *buffer == '/') {
|
|
+ goto out;
|
|
}
|
|
if (buflen < namelen)
|
|
goto Elong;
|
|
@@ -1875,18 +1878,6 @@ Elong:
|
|
goto out;
|
|
}
|
|
|
|
-static char *__connect_d_path(char *path, char *buffer)
|
|
-{
|
|
- if (!IS_ERR(path) && *path != '/') {
|
|
- /* Pretend that disconnected paths are hanging off the root. */
|
|
- if (path == buffer)
|
|
- path = ERR_PTR(-ENAMETOOLONG);
|
|
- else
|
|
- *--path = '/';
|
|
- }
|
|
- return path;
|
|
-}
|
|
-
|
|
/* write full pathname into buffer and return start of pathname */
|
|
char *d_path(struct dentry *dentry, struct vfsmount *vfsmnt, char *buf,
|
|
int buflen)
|
|
@@ -1909,8 +1900,7 @@ char *d_path(struct dentry *dentry, stru
|
|
rootmnt = mntget(current->fs->rootmnt);
|
|
root = dget(current->fs->root);
|
|
read_unlock(¤t->fs->lock);
|
|
- res = __d_path(dentry, vfsmnt, root, rootmnt, buf, buflen, 0);
|
|
- res = __connect_d_path(res, buf);
|
|
+ res = __d_path(dentry, vfsmnt, root, rootmnt, buf, buflen, 0, 0);
|
|
dput(root);
|
|
mntput(rootmnt);
|
|
return res;
|
|
@@ -1972,8 +1962,7 @@ asmlinkage long sys_getcwd(char __user *
|
|
root = dget(current->fs->root);
|
|
read_unlock(¤t->fs->lock);
|
|
|
|
- cwd = __d_path(pwd, pwdmnt, root, rootmnt, page, PAGE_SIZE, 1);
|
|
- cwd = __connect_d_path(cwd, page);
|
|
+ cwd = __d_path(pwd, pwdmnt, root, rootmnt, page, PAGE_SIZE, 1, 0);
|
|
error = PTR_ERR(cwd);
|
|
if (IS_ERR(cwd))
|
|
goto out;
|
|
--- a/fs/namespace.c
|
|
+++ b/fs/namespace.c
|
|
@@ -1901,7 +1901,7 @@ char *d_namespace_path(struct dentry *de
|
|
mntput(rootmnt);
|
|
if (nsrootmnt)
|
|
root = dget(nsrootmnt->mnt_root);
|
|
- res = __d_path(dentry, vfsmnt, root, nsrootmnt, buf, buflen, 1);
|
|
+ res = __d_path(dentry, vfsmnt, root, nsrootmnt, buf, buflen, 1, 1);
|
|
dput(root);
|
|
mntput(nsrootmnt);
|
|
/* Prevent empty path for lazily unmounted filesystems. */
|
|
--- a/include/linux/dcache.h
|
|
+++ b/include/linux/dcache.h
|
|
@@ -301,7 +301,7 @@ extern int d_validate(struct dentry *, s
|
|
extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
|
|
|
|
extern char *__d_path(struct dentry *, struct vfsmount *, struct dentry *,
|
|
- struct vfsmount *, char *, int, int);
|
|
+ struct vfsmount *, char *, int, int, int);
|
|
extern char * d_path(struct dentry *, struct vfsmount *, char *, int);
|
|
|
|
/* Allocation counts.. */
|