Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
989f74e0
Commit
989f74e0
authored
Mar 25, 2016
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
constify security_path_{unlink,rmdir}
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
d6b49f7a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
include/linux/lsm_hooks.h
include/linux/lsm_hooks.h
+2
-2
include/linux/security.h
include/linux/security.h
+4
-4
security/apparmor/lsm.c
security/apparmor/lsm.c
+2
-2
security/security.c
security/security.c
+2
-2
security/tomoyo/tomoyo.c
security/tomoyo/tomoyo.c
+2
-2
No files found.
include/linux/lsm_hooks.h
View file @
989f74e0
...
...
@@ -1360,10 +1360,10 @@ union security_list_options {
#ifdef CONFIG_SECURITY_PATH
int
(
*
path_unlink
)(
struct
path
*
dir
,
struct
dentry
*
dentry
);
int
(
*
path_unlink
)(
const
struct
path
*
dir
,
struct
dentry
*
dentry
);
int
(
*
path_mkdir
)(
struct
path
*
dir
,
struct
dentry
*
dentry
,
umode_t
mode
);
int
(
*
path_rmdir
)(
struct
path
*
dir
,
struct
dentry
*
dentry
);
int
(
*
path_rmdir
)(
const
struct
path
*
dir
,
struct
dentry
*
dentry
);
int
(
*
path_mknod
)(
struct
path
*
dir
,
struct
dentry
*
dentry
,
umode_t
mode
,
unsigned
int
dev
);
int
(
*
path_truncate
)(
const
struct
path
*
path
);
...
...
include/linux/security.h
View file @
989f74e0
...
...
@@ -1442,9 +1442,9 @@ static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi
#endif
/* CONFIG_SECURITY_NETWORK_XFRM */
#ifdef CONFIG_SECURITY_PATH
int
security_path_unlink
(
struct
path
*
dir
,
struct
dentry
*
dentry
);
int
security_path_unlink
(
const
struct
path
*
dir
,
struct
dentry
*
dentry
);
int
security_path_mkdir
(
struct
path
*
dir
,
struct
dentry
*
dentry
,
umode_t
mode
);
int
security_path_rmdir
(
struct
path
*
dir
,
struct
dentry
*
dentry
);
int
security_path_rmdir
(
const
struct
path
*
dir
,
struct
dentry
*
dentry
);
int
security_path_mknod
(
struct
path
*
dir
,
struct
dentry
*
dentry
,
umode_t
mode
,
unsigned
int
dev
);
int
security_path_truncate
(
const
struct
path
*
path
);
...
...
@@ -1459,7 +1459,7 @@ int security_path_chmod(const struct path *path, umode_t mode);
int
security_path_chown
(
const
struct
path
*
path
,
kuid_t
uid
,
kgid_t
gid
);
int
security_path_chroot
(
struct
path
*
path
);
#else
/* CONFIG_SECURITY_PATH */
static
inline
int
security_path_unlink
(
struct
path
*
dir
,
struct
dentry
*
dentry
)
static
inline
int
security_path_unlink
(
const
struct
path
*
dir
,
struct
dentry
*
dentry
)
{
return
0
;
}
...
...
@@ -1470,7 +1470,7 @@ static inline int security_path_mkdir(struct path *dir, struct dentry *dentry,
return
0
;
}
static
inline
int
security_path_rmdir
(
struct
path
*
dir
,
struct
dentry
*
dentry
)
static
inline
int
security_path_rmdir
(
const
struct
path
*
dir
,
struct
dentry
*
dentry
)
{
return
0
;
}
...
...
security/apparmor/lsm.c
View file @
989f74e0
...
...
@@ -245,7 +245,7 @@ static int common_perm_create(int op, const struct path *dir,
return
common_perm_dir_dentry
(
op
,
dir
,
dentry
,
mask
,
&
cond
);
}
static
int
apparmor_path_unlink
(
struct
path
*
dir
,
struct
dentry
*
dentry
)
static
int
apparmor_path_unlink
(
const
struct
path
*
dir
,
struct
dentry
*
dentry
)
{
return
common_perm_rm
(
OP_UNLINK
,
dir
,
dentry
,
AA_MAY_DELETE
);
}
...
...
@@ -257,7 +257,7 @@ static int apparmor_path_mkdir(struct path *dir, struct dentry *dentry,
S_IFDIR
);
}
static
int
apparmor_path_rmdir
(
struct
path
*
dir
,
struct
dentry
*
dentry
)
static
int
apparmor_path_rmdir
(
const
struct
path
*
dir
,
struct
dentry
*
dentry
)
{
return
common_perm_rm
(
OP_RMDIR
,
dir
,
dentry
,
AA_MAY_DELETE
);
}
...
...
security/security.c
View file @
989f74e0
...
...
@@ -427,14 +427,14 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode)
}
EXPORT_SYMBOL
(
security_path_mkdir
);
int
security_path_rmdir
(
struct
path
*
dir
,
struct
dentry
*
dentry
)
int
security_path_rmdir
(
const
struct
path
*
dir
,
struct
dentry
*
dentry
)
{
if
(
unlikely
(
IS_PRIVATE
(
d_backing_inode
(
dir
->
dentry
))))
return
0
;
return
call_int_hook
(
path_rmdir
,
0
,
dir
,
dentry
);
}
int
security_path_unlink
(
struct
path
*
dir
,
struct
dentry
*
dentry
)
int
security_path_unlink
(
const
struct
path
*
dir
,
struct
dentry
*
dentry
)
{
if
(
unlikely
(
IS_PRIVATE
(
d_backing_inode
(
dir
->
dentry
))))
return
0
;
...
...
security/tomoyo/tomoyo.c
View file @
989f74e0
...
...
@@ -163,7 +163,7 @@ static int tomoyo_path_truncate(const struct path *path)
*
* Returns 0 on success, negative value otherwise.
*/
static
int
tomoyo_path_unlink
(
struct
path
*
parent
,
struct
dentry
*
dentry
)
static
int
tomoyo_path_unlink
(
const
struct
path
*
parent
,
struct
dentry
*
dentry
)
{
struct
path
path
=
{
parent
->
mnt
,
dentry
};
return
tomoyo_path_perm
(
TOMOYO_TYPE_UNLINK
,
&
path
,
NULL
);
...
...
@@ -194,7 +194,7 @@ static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
*
* Returns 0 on success, negative value otherwise.
*/
static
int
tomoyo_path_rmdir
(
struct
path
*
parent
,
struct
dentry
*
dentry
)
static
int
tomoyo_path_rmdir
(
const
struct
path
*
parent
,
struct
dentry
*
dentry
)
{
struct
path
path
=
{
parent
->
mnt
,
dentry
};
return
tomoyo_path_perm
(
TOMOYO_TYPE_RMDIR
,
&
path
,
NULL
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment