openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[apparmor] constify struct path * in a bunch of helpers 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2016-03-25 14:18:14 -04:00
parent f55532a0c0
commit 2c7661ff41
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/apparmor/file.c
View File

@ -275,7 +275,7 @@ static inline bool is_deleted(struct dentry *dentry)
* *
* Returns: %0 else error if access denied or other error * Returns: %0 else error if access denied or other error
*/ */
int aa_path_perm(int op, struct aa_profile *profile, struct path *path, int aa_path_perm(int op, struct aa_profile *profile, const struct path *path,
int flags, u32 request, struct path_cond *cond) int flags, u32 request, struct path_cond *cond)
{ {
char *buffer = NULL; char *buffer = NULL;

2
security/apparmor/include/file.h
View File

@ -171,7 +171,7 @@ unsigned int aa_str_perms(struct aa_dfa *dfa, unsigned int start,
const char *name, struct path_cond *cond, const char *name, struct path_cond *cond,
struct file_perms *perms); struct file_perms *perms);
int aa_path_perm(int op, struct aa_profile *profile, struct path *path, int aa_path_perm(int op, struct aa_profile *profile, const struct path *path,
int flags, u32 request, struct path_cond *cond); int flags, u32 request, struct path_cond *cond);
int aa_path_link(struct aa_profile *profile, struct dentry *old_dentry, int aa_path_link(struct aa_profile *profile, struct dentry *old_dentry,

2
security/apparmor/include/path.h
View File

@ -26,7 +26,7 @@ enum path_flags {
PATH_MEDIATE_DELETED = 0x10000, /* mediate deleted paths */ PATH_MEDIATE_DELETED = 0x10000, /* mediate deleted paths */
}; };
int aa_path_name(struct path *path, int flags, char **buffer, int aa_path_name(const struct path *path, int flags, char **buffer,
const char **name, const char **info); const char **name, const char **info);
#endif /* __AA_PATH_H */ #endif /* __AA_PATH_H */

2
security/apparmor/lsm.c
View File

@ -149,7 +149,7 @@ static int apparmor_capable(const struct cred *cred, struct user_namespace *ns,
* *
* Returns: %0 else error code if error or permission denied * Returns: %0 else error code if error or permission denied
*/ */
static int common_perm(int op, struct path *path, u32 mask, static int common_perm(int op, const struct path *path, u32 mask,
struct path_cond *cond) struct path_cond *cond)
{ {
struct aa_profile *profile; struct aa_profile *profile;

8
security/apparmor/path.c
View File

@ -53,7 +53,7 @@ static int prepend(char **buffer, int buflen, const char *str, int namelen)
* When no error the path name is returned in @name which points to * When no error the path name is returned in @name which points to
* to a position in @buf * to a position in @buf
*/ */
static int d_namespace_path(struct path *path, char *buf, int buflen, static int d_namespace_path(const struct path *path, char *buf, int buflen,
char **name, int flags) char **name, int flags)
{ {
char *res; char *res;
@ -158,7 +158,7 @@ static int d_namespace_path(struct path *path, char *buf, int buflen,
* *
* Returns: %0 else error on failure * Returns: %0 else error on failure
*/ */
static int get_name_to_buffer(struct path *path, int flags, char *buffer, static int get_name_to_buffer(const struct path *path, int flags, char *buffer,
int size, char **name, const char **info) int size, char **name, const char **info)
{ {
int adjust = (flags & PATH_IS_DIR) ? 1 : 0; int adjust = (flags & PATH_IS_DIR) ? 1 : 0;
@ -204,8 +204,8 @@ static int get_name_to_buffer(struct path *path, int flags, char *buffer,
* *
* Returns: %0 else error code if could retrieve name * Returns: %0 else error code if could retrieve name
*/ */
int aa_path_name(struct path *path, int flags, char **buffer, const char **name, int aa_path_name(const struct path *path, int flags, char **buffer,
const char **info) const char **name, const char **info)
{ {
char *buf, *str = NULL; char *buf, *str = NULL;
int size = 256; int size = 256;