diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-02 09:14:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-02 09:14:01 -0700 |
| commit | 27787ba3fa4904422b3928b898d1bd3d74d98bea (patch) | |
| tree | 72fce8989a8214f927f3afccaa39d11de38ccb59 /security/apparmor | |
| parent | b28866f4bb77095c262dfd5783197b691c624fa6 (diff) | |
| parent | 80e5d1ff5d5f1ed5167a69b7c2fe86071b615f6b (diff) | |
| download | lwn-27787ba3fa4904422b3928b898d1bd3d74d98bea.tar.gz lwn-27787ba3fa4904422b3928b898d1bd3d74d98bea.zip | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted stuff all over the place"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
useful constants: struct qstr for ".."
hostfs_open(): don't open-code file_dentry()
whack-a-mole: kill strlen_user() (again)
autofs: should_expire() argument is guaranteed to be positive
apparmor:match_mn() - constify devpath argument
buffer: a small optimization in grow_buffers
get rid of autofs_getpath()
constify dentry argument of dentry_path()/dentry_path_raw()
Diffstat (limited to 'security/apparmor')
| -rw-r--r-- | security/apparmor/mount.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c index e0828ee7a345..aa6fcfde3051 100644 --- a/security/apparmor/mount.c +++ b/security/apparmor/mount.c @@ -370,7 +370,7 @@ audit: * Returns: 0 on success else error */ static int match_mnt(struct aa_profile *profile, const struct path *path, - char *buffer, struct path *devpath, char *devbuffer, + char *buffer, const struct path *devpath, char *devbuffer, const char *type, unsigned long flags, void *data, bool binary) { @@ -579,7 +579,7 @@ out: return error; } -static int profile_umount(struct aa_profile *profile, struct path *path, +static int profile_umount(struct aa_profile *profile, const struct path *path, char *buffer) { struct aa_perms perms = { }; |