leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tomoyo: struct path it might get from LSM callers won't have NULL dentry or mnt

Browse Source 
Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2022-01-30 21:15:36 -05:00
parent 89868773fe
commit 467cf8ef88
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/tomoyo/file.c
View File

@ -717,7 +717,7 @@ int tomoyo_path_number_perm(const u8 type, const struct path *path,
int idx; int idx;
if (tomoyo_init_request_info(&r, NULL, tomoyo_pn2mac[type]) if (tomoyo_init_request_info(&r, NULL, tomoyo_pn2mac[type])
== TOMOYO_CONFIG_DISABLED || !path->dentry) == TOMOYO_CONFIG_DISABLED)
return 0; return 0;
idx = tomoyo_read_lock(); idx = tomoyo_read_lock();
if (!tomoyo_get_realpath(&buf, path)) if (!tomoyo_get_realpath(&buf, path))

9
security/tomoyo/realpath.c
View File

@ -240,11 +240,8 @@ char *tomoyo_realpath_from_path(const struct path *path)
char *name = NULL; char *name = NULL;
unsigned int buf_len = PAGE_SIZE / 2; unsigned int buf_len = PAGE_SIZE / 2;
struct dentry *dentry = path->dentry; struct dentry *dentry = path->dentry;
struct super_block *sb; struct super_block *sb = dentry->d_sb;
if (!dentry)
return NULL;
sb = dentry->d_sb;
while (1) { while (1) {
char *pos; char *pos;
struct inode *inode; struct inode *inode;
@ -264,10 +261,8 @@ char *tomoyo_realpath_from_path(const struct path *path)
inode = d_backing_inode(sb->s_root); inode = d_backing_inode(sb->s_root);
/* /*
* Get local name for filesystems without rename() operation * Get local name for filesystems without rename() operation
* or dentry without vfsmount.
*/ */
if (!path->mnt || if ((!inode->i_op->rename &&
(!inode->i_op->rename &&
!(sb->s_type->fs_flags & FS_REQUIRES_DEV))) !(sb->s_type->fs_flags & FS_REQUIRES_DEV)))
pos = tomoyo_get_local_path(path->dentry, buf, pos = tomoyo_get_local_path(path->dentry, buf,
buf_len - 1); buf_len - 1);