UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

a couple of assorted tomoyo patches 

-----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQQqUNBr3gm4hGXdBJlZ7Krx/gZQ6wUCYzxjfQAKCRBZ7Krx/gZQ
 63XXAQCC4mKe9HVosfkC6rmoN5ADJCl+lMmk5q8OFN8w7MQrGgD/cF0fVAyYvotr
 iRCwx8qAqQVmsh+d3DzU1UVP+f54owU=
 =pAf9
 -----END PGP SIGNATURE-----

Merge tag 'pull-tomoyo' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull misc tomoyo changes from Al Viro:
 "A couple of assorted tomoyo patches"

* tag 'pull-tomoyo' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  tomoyo: struct path it might get from LSM callers won't have NULL dentry or mnt
  tomoyo: use vsnprintf() properly
This commit is contained in:
Linus Torvalds 2022-10-06 17:26:56 -07:00
parent ab29622157 467cf8ef88
commit 1586a7036d
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/tomoyo/audit.c
View File

@ -423,7 +423,7 @@ void tomoyo_write_log(struct tomoyo_request_info *r, const char *fmt, ...)
int len; int len;
va_start(args, fmt); va_start(args, fmt);
len = vsnprintf((char *) &len, 1, fmt, args) + 1; len = vsnprintf(NULL, 0, fmt, args) + 1;
va_end(args); va_end(args);
va_start(args, fmt); va_start(args, fmt);
tomoyo_write_log2(r, len, fmt, args); tomoyo_write_log2(r, len, fmt, args);

2
security/tomoyo/common.c
View File

@ -2057,7 +2057,7 @@ int tomoyo_supervisor(struct tomoyo_request_info *r, const char *fmt, ...)
bool quota_exceeded = false; bool quota_exceeded = false;
va_start(args, fmt); va_start(args, fmt);
len = vsnprintf((char *) &len, 1, fmt, args) + 1; len = vsnprintf(NULL, 0, fmt, args) + 1;
va_end(args); va_end(args);
/* Write /sys/kernel/security/tomoyo/audit. */ /* Write /sys/kernel/security/tomoyo/audit. */
va_start(args, fmt); va_start(args, fmt);

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);