git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...
[safe/jmp/linux-2.6]
/
security
/
capability.c
diff --git
a/security/capability.c
b/security/capability.c
index
09279a8
..
4875142
100644
(file)
--- a/
security/capability.c
+++ b/
security/capability.c
@@
-319,6
+319,11
@@
static int cap_path_chown(struct path *path, uid_t uid, gid_t gid)
{
return 0;
}
{
return 0;
}
+
+static int cap_path_chroot(struct path *root)
+{
+ return 0;
+}
#endif
static int cap_file_permission(struct file *file, int mask)
#endif
static int cap_file_permission(struct file *file, int mask)
@@
-416,7
+421,7
@@
static int cap_kernel_create_files_as(struct cred *new, struct inode *inode)
return 0;
}
return 0;
}
-static int cap_kernel_module_request(
void
)
+static int cap_kernel_module_request(
char *kmod_name
)
{
return 0;
}
{
return 0;
}
@@
-901,10
+906,6
@@
static void cap_audit_rule_free(void *lsmrule)
}
#endif /* CONFIG_AUDIT */
}
#endif /* CONFIG_AUDIT */
-struct security_operations default_security_ops = {
- .name = "default",
-};
-
#define set_to_cap_if_null(ops, function) \
do { \
if (!ops->function) { \
#define set_to_cap_if_null(ops, function) \
do { \
if (!ops->function) { \
@@
-990,6
+991,7
@@
void security_fixup_ops(struct security_operations *ops)
set_to_cap_if_null(ops, path_truncate);
set_to_cap_if_null(ops, path_chmod);
set_to_cap_if_null(ops, path_chown);
set_to_cap_if_null(ops, path_truncate);
set_to_cap_if_null(ops, path_chmod);
set_to_cap_if_null(ops, path_chown);
+ set_to_cap_if_null(ops, path_chroot);
#endif
set_to_cap_if_null(ops, file_permission);
set_to_cap_if_null(ops, file_alloc_security);
#endif
set_to_cap_if_null(ops, file_permission);
set_to_cap_if_null(ops, file_alloc_security);