LSM fix for stupid "empty" functions
RFC 1/1 LSM fix for stupid "empty" functions
Hi all,
I'm _really_ tired of all of the "empty" functions that all security modules need to provide. So here's a brute force patch that lets any security module only set the functions that it wants to override. If the function is NULL, then the "dummy" function will be used instead.
What do people think of this? I also cleaned up the comment in the verify function of security/security.c and made it not inline.
Comments welcome (if there are none, I'll send it on to Linus.) The patch below is against 2.5.50. As you can see by the diffstat, it does make security modules a lot smaller :)
We could also remove all of the initializers for dummy_security_ops with this patch, reducing the code size some more, if people really want to...
thanks,
greg k-h
security/capability.c | 530 -------------------------------------------------- security/dummy.c | 164 ++++++++++++--- security/security.c | 14 - 3 files changed, 142 insertions(+), 566 deletions(-)
===== security/capability.c 1.10 vs edited =====
security/capability.c +0 -530
@@ -279,550 +279,20 @@#ifdef CONFIG_SECURITY -static int cap_quotactl (int cmds,int type,int id,struct super_block *sb) -{ -return 0 ; -} - -static int cap_quota_on (struct file *f) -{ -return 0 ; -} - -static int cap_acct (struct file *file) -{ -return 0 ; -} - -static int cap_bprm_alloc_security (struct linux_binprm *bprm) -{ -return 0 ; -} - -static int cap_bprm_check_security (struct linux_binprm *bprm) -{ -return 0 ; -} - -static void cap_bprm_free_security (struct linux_binprm *bprm) -{ -return ; -} - -static int cap_sb_alloc_security (struct super_block *sb) -{ -return 0 ; -} - -static void cap_sb_free_security (struct super_block *sb) -{ -return ; -} - -static int cap_sb_statfs (struct super_block *sb) -{ -return 0 ; -} - -static int cap_mount (char *dev_name,struct nameidata *nd,char *type, -unsigned long flags,void *data) -{ -return 0 ; -} - -static int cap_check_sb (struct vfsmount *mnt,struct nameidata *nd) -{ -return 0 ; -} - -static int cap_umount (struct vfsmount *mnt,int flags) -{ -return 0 ; -} - -static void cap_umount_close (struct vfsmount *mnt) -{ -return ; -} - -static void cap_umount_busy (struct vfsmount *mnt) -{ -return ; -} - -static void cap_post_remount (struct vfsmount *mnt,unsigned long flags, -void *data) -{ -return ; -} - -static void cap_post_mountroot (void ) -{ -return ; -} - -static void cap_post_addmount (struct vfsmount *mnt,struct nameidata *nd) -{ -return ; -} - -static int cap_pivotroot (struct nameidata *old_nd,struct nameidata *new_nd) -{ -return 0 ; -} - -static void cap_post_pivotroot (struct nameidata *old_nd,struct nameidata *new_nd) -{ -return ; -} - -static int cap_inode_alloc_security (struct inode *inode) -{ -return 0 ; -} - -static void cap_inode_free_security (struct inode *inode) -{ -return ; -} - -static int cap_inode_create (struct inode *inode,struct dentry *dentry, -int mask) -{ -return 0 ; -} - -static void cap_inode_post_create (struct inode *inode,struct dentry *dentry, -int mask) -{ -return ; -} - -static int cap_inode_link (struct dentry *old_dentry,struct inode *inode, -struct dentry *new_dentry) -{ -return 0 ; -} - -static void cap_inode_post_link (struct dentry *old_dentry,struct inode *inode, -struct dentry *new_dentry) -{ -return ; -} - -static int cap_inode_unlink (struct inode *inode,struct dentry *dentry) -{ -return 0 ; -} - -static int cap_inode_symlink (struct inode *inode,struct dentry *dentry, -const char *name) -{ -return 0 ; -} - -static void cap_inode_post_symlink (struct inode *inode,struct dentry *dentry, -const char *name) -{ -return ; -} - -static int cap_inode_mkdir (struct inode *inode,struct dentry *dentry, -int mask) -{ -return 0 ; -} - -static void cap_inode_post_mkdir (struct inode *inode,struct dentry *dentry, -int mask) -{ -return ; -} - -static int cap_inode_rmdir (struct inode *inode,struct dentry *dentry) -{ -return 0 ; -} - -static int cap_inode_mknod (struct inode *inode,struct dentry *dentry, -int mode,dev_t dev) -{ -return 0 ; -} - -static void cap_inode_post_mknod (struct inode *inode,struct dentry *dentry, -int mode,dev_t dev) -{ -return ; -} - -static int cap_inode_rename (struct inode *old_inode,struct dentry *old_dentry, -struct inode *new_inode,struct dentry *new_dentry) -{ -return 0 ; -} - -static void cap_inode_post_rename (struct inode *old_inode, -struct dentry *old_dentry, -struct inode *new_inode, -struct dentry *new_dentry) -{ -return ; -} - -static int cap_inode_readlink (struct dentry *dentry) -{ -return 0 ; -} - -static int cap_inode_follow_link (struct dentry *dentry, -struct nameidata *nameidata) -{ -return 0 ; -} - -static int cap_inode_permission (struct inode *inode,int mask) -{ -return 0 ; -} - -static int cap_inode_permission_lite (struct inode *inode,int mask) -{ -return 0 ; -} - -static int cap_inode_setattr (struct dentry *dentry,struct iattr *iattr) -{ -return 0 ; -} - -static int cap_inode_getattr (struct vfsmount *mnt,struct dentry *dentry) -{ -return 0 ; -} - -static void cap_post_lookup (struct inode *ino,struct dentry *d) -{ -return ; -} - -static void cap_delete (struct inode *ino) -{ -return ; -} - -static int cap_inode_setxattr (struct dentry *dentry,char *name,void *value, -size_t size,int flags) -{ -return 0 ; -} - -static int cap_inode_getxattr (struct dentry *dentry,char *name) -{ -return 0 ; -} - -static int cap_inode_listxattr (struct dentry *dentry) -{ -return 0 ; -} - -static int cap_inode_removexattr (struct dentry *dentry,char *name) -{ -return 0 ; -} - -static int cap_file_permission (struct file *file,int mask) -{ -return 0 ; -} - -static int cap_file_alloc_security (struct file *file) -{ -return 0 ; -} - -static void cap_file_free_security (struct file *file) -{ -return ; -} - -static int cap_file_ioctl (struct file *file,unsigned int command, -unsigned long arg) -{ -return 0 ; -} - -static int cap_file_mmap (struct file *file,unsigned long prot, -unsigned long flags) -{ -return 0 ; -} - -static int cap_file_mprotect (struct vm_area_struct *vma,unsigned long prot) -{ -return 0 ; -} - -static int cap_file_lock (struct file *file,unsigned int cmd) -{ -return 0 ; -} - -static int cap_file_fcntl (struct file *file,unsigned int cmd, -unsigned long arg) -{ -return 0 ; -} - -static int cap_file_set_fowner (struct file *file) -{ -return 0 ; -} - -static int cap_file_send_sigiotask (struct task_struct *tsk, -struct fown_struct *fown,int fd, -int reason) -{ -return 0 ; -} - -static int cap_file_receive (struct file *file) -{ -return 0 ; -} - -static int cap_task_create (unsigned long clone_flags) -{ -return 0 ; -} - -static int cap_task_alloc_security (struct task_struct *p) -{ -return 0 ; -} - -static void cap_task_free_security (struct task_struct *p) -{ -return ; -} - -static int cap_task_setuid (uid_t id0,uid_t id1,uid_t id2,int flags) -{ -return 0 ; -} - -static int cap_task_setgid (gid_t id0,gid_t id1,gid_t id2,int flags) -{ -return 0 ; -} - -static int cap_task_setpgid (struct task_struct *p,pid_t pgid) -{ -return 0 ; -} - -static int cap_task_getpgid (struct task_struct *p) -{ -return 0 ; -} - -static int cap_task_getsid (struct task_struct *p) -{ -return 0 ; -} - -static int cap_task_setgroups (int gidsetsize,gid_t * grouplist) -{ -return 0 ; -} - -static int cap_task_setnice (struct task_struct *p,int nice) -{ -return 0 ; -} - -static int cap_task_setrlimit (unsigned int resource,struct rlimit *new_rlim) -{ -return 0 ; -} - -static int cap_task_setscheduler (struct task_struct *p,int policy, -struct sched_param *lp) -{ -return 0 ; -} - -static int cap_task_getscheduler (struct task_struct *p) -{ -return 0 ; -} - -static int cap_task_wait (struct task_struct *p) -{ -return 0 ; -} - -static int cap_task_kill (struct task_struct *p,struct siginfo *info,int sig) -{ -return 0 ; -} - -static int cap_task_prctl (int option,unsigned long arg2,unsigned long arg3, -unsigned long arg4,unsigned long arg5) -{ -return 0 ; -} - -static int cap_ipc_permission (struct kern_ipc_perm *ipcp,short flag) -{ -return 0 ; -} - -static int cap_msg_queue_alloc_security (struct msg_queue *msq) -{ -return 0 ; -} - -static void cap_msg_queue_free_security (struct msg_queue *msq) -{ -return ; -} - -static int cap_shm_alloc_security (struct shmid_kernel *shp) -{ -return 0 ; -} - -static void cap_shm_free_security (struct shmid_kernel *shp) -{ -return ; -} - -static int cap_sem_alloc_security (struct sem_array *sma) -{ -return 0 ; -} - -static void cap_sem_free_security (struct sem_array *sma) -{ -return ; -} - -static int cap_register (const char *name,struct security_operations *ops) -{ -return -EINVAL ; -} - -static int cap_unregister (const char *name,struct security_operations *ops) -{ -return -EINVAL ; -}static struct security_operations capability_ops = { .ptrace = cap_ptrace, .capget = cap_capget, .capset_check = cap_capset_check, .capset_set = cap_capset_set, - .acct = cap_acct, .capable = cap_capable, - .quotactl = cap_quotactl, - .quota_on = cap_quota_on, - .bprm_alloc_security = cap_bprm_alloc_security, - .bprm_free_security = cap_bprm_free_security, .bprm_compute_creds = cap_bprm_compute_creds, .bprm_set_security = cap_bprm_set_security, - .bprm_check_security = cap_bprm_check_security, - - .sb_alloc_security = cap_sb_alloc_security, - .sb_free_security = cap_sb_free_security, - .sb_statfs = cap_sb_statfs, - .sb_mount = cap_mount, - .sb_check_sb = cap_check_sb, - .sb_umount = cap_umount, - .sb_umount_close = cap_umount_close, - .sb_umount_busy = cap_umount_busy, - .sb_post_remount = cap_post_remount, - .sb_post_mountroot = cap_post_mountroot, - .sb_post_addmount = cap_post_addmount, - .sb_pivotroot = cap_pivotroot, - .sb_post_pivotroot = cap_post_pivotroot, - - .inode_alloc_security = cap_inode_alloc_security, - .inode_free_security = cap_inode_free_security, - .inode_create = cap_inode_create, - .inode_post_create = cap_inode_post_create, - .inode_link = cap_inode_link, - .inode_post_link = cap_inode_post_link, - .inode_unlink = cap_inode_unlink, - .inode_symlink = cap_inode_symlink, - .inode_post_symlink = cap_inode_post_symlink, - .inode_mkdir = cap_inode_mkdir, - .inode_post_mkdir = cap_inode_post_mkdir, - .inode_rmdir = cap_inode_rmdir, - .inode_mknod = cap_inode_mknod, - .inode_post_mknod = cap_inode_post_mknod, - .inode_rename = cap_inode_rename, - .inode_post_rename = cap_inode_post_rename, - .inode_readlink = cap_inode_readlink, - .inode_follow_link = cap_inode_follow_link, - .inode_permission = cap_inode_permission, - .inode_permission_lite = cap_inode_permission_lite, - .inode_setattr = cap_inode_setattr, - .inode_getattr = cap_inode_getattr, - .inode_post_lookup = cap_post_lookup, - .inode_delete = cap_delete, - .inode_setxattr = cap_inode_setxattr, - .inode_getxattr = cap_inode_getxattr, - .inode_listxattr = cap_inode_listxattr, - .inode_removexattr = cap_inode_removexattr, - - .file_permission = cap_file_permission, - .file_alloc_security = cap_file_alloc_security, - .file_free_security = cap_file_free_security, - .file_ioctl = cap_file_ioctl, - .file_mmap = cap_file_mmap, - .file_mprotect = cap_file_mprotect, - .file_lock = cap_file_lock, - .file_fcntl = cap_file_fcntl, - .file_set_fowner = cap_file_set_fowner, - .file_send_sigiotask = cap_file_send_sigiotask, - .file_receive = cap_file_receive, - .task_create = cap_task_create, - .task_alloc_security = cap_task_alloc_security, - .task_free_security = cap_task_free_security, - .task_setuid = cap_task_setuid, .task_post_setuid = cap_task_post_setuid, - .task_setgid = cap_task_setgid, - .task_setpgid = cap_task_setpgid, - .task_getpgid = cap_task_getpgid, - .task_getsid = cap_task_getsid, - .task_setgroups = cap_task_setgroups, - .task_setnice = cap_task_setnice, - .task_setrlimit = cap_task_setrlimit, - .task_setscheduler = cap_task_setscheduler, - .task_getscheduler = cap_task_getscheduler, - .task_wait = cap_task_wait, - .task_kill = cap_task_kill, - .task_prctl = cap_task_prctl, .task_kmod_set_label = cap_task_kmod_set_label, .task_reparent_to_init = cap_task_reparent_to_init, - - .ipc_permission = cap_ipc_permission, - - .msg_queue_alloc_security = cap_msg_queue_alloc_security, - .msg_queue_free_security = cap_msg_queue_free_security, - - .shm_alloc_security = cap_shm_alloc_security, - .shm_free_security = cap_shm_free_security, - - .sem_alloc_security = cap_sem_alloc_security, - .sem_free_security = cap_sem_free_security, - - .register_security = cap_register, - .unregister_security = cap_unregister, };#if defined(CONFIG_SECURITY_CAPABILITIES_MODULE )
===== security/dummy.c 1.10 vs edited =====
security/dummy.c +134 -30
244 lines not on this page · raw message
===== security/security.c 1.4 vs edited =====
security/security.c +8 -6
@@ -20,7 +20,9 @@#define SECURITY_SCAFFOLD_VERSION "1.0.0" -extern struct security_operations dummy_security_ops;/* lives in dummy.c */ +/* things that live in dummy.c */ +extern struct security_operations dummy_security_ops; +extern void security_fixup_ops (struct security_operations *ops);struct security_operations *security_ops;/* Initialized to NULL */
@@ -45,7 +47,7 @@ } \ }while (0 ) -static int inline verify (struct security_operations *ops) +static int verify (struct security_operations *ops) {int err;
@@ -59,11 +61,8 @@/* Perform a little sanity checking on our inputs */ err =0 ; -/* This first check scans the whole security_ops struct for +/* This check scans the whole security_ops struct for * missing structs or functions. -* -* (There is no further check now, but will leave as is until -* the lazy registration stuff is done -- JM). */ VERIFY_STRUCT(struct security_operations, ops, err);
@@ -106,6 +105,7 @@*/ int register_security (struct security_operations *ops) { +security_fixup_ops (ops);if (verify (ops)) { printk (KERN_INFO "%s could not verify "
@@ -162,6 +162,8 @@*/ int mod_reg_security (const char *name,struct security_operations *ops) { +security_fixup_ops (ops); +if (verify (ops)) {printk (KERN_INFO "%s could not verify " "security operations.\n" , __FUNCTION__);
Quoted 5 lines · Greg KH
I'm _really_ tired of all of the "empty" functions that all security modules need to provide. So here's a brute force patch that lets any security module only set the functions that it wants to override. If the function is NULL, then the "dummy" function will be used instead.
Sounds good to me. So you're just creating a default null function, and then stuffing all the stubs with a pointer to that function?
Quoted 2 lines
Comments welcome (if there are none, I'll send it on to Linus.)
I suggest holding that post to Linus until Tuesday am. Lots of people are likely taking a long weekend away from software, and won't see your post until Monday morning.
Thanks,
Crispin
Signature · 5 lines
Crispin Cowan, Ph.D. Chief Scientist, WireX http://wirex.com/~crispin/ Security Hardened Linux Distribution: http://immunix.org Available for purchase: http://wirex.com/Products/Immunix/purchase.html Just say ".Nyet"
Quoted 9 lines · Crispin Cowan
Quoted 5 lines · Greg KH
I'm _really_ tired of all of the "empty" functions that all security modules need to provide. So here's a brute force patch that lets any security module only set the functions that it wants to override. If the function is NULL, then the "dummy" function will be used instead.
Sounds good to me. So you're just creating a default null function, and then stuffing all the stubs with a pointer to that function?
No, it uses the dummy_* function that matches that function type if you do not specify the function. Look at the definition of the set_to_dummy_if_null() macro for how it works.
thanks,
greg k-h
Quoted 7 lines · Greg KH
I'm _really_ tired of all of the "empty" functions that all security modules need to provide. So here's a brute force patch that lets any security module only set the functions that it wants to override. If the function is NULL, then the "dummy" function will be used instead.
What do people think of this? I also cleaned up the comment in the verify function of
security/security.cand made it not inline.
I second this. It's very annoying and error-prone to define lots of unnecessary functions, not to mention maintainability.
Quoted 3 lines
=====
security/security.c1.4 vs edited =====security/security.c +0
-0
[...]
Quoted 4 lines
security/security.c +0
-0@@ -59,11 +61,8 @@/* Perform a little sanity checking on our inputs */ err =0 ;
[...]
Quoted 1 line
VERIFY_STRUCT(struct security_operations, ops, err);
This shouldn't be necessary anymore.
security/security.c line 108
Quoted 5 lines
security/security.c +1
-0@@ -106,6 +105,7 @@*/ int register_security (struct security_operations *ops) { +security_fixup_ops (ops);
You're patching other people's data structures. Not everybody may like this. Maybe it's even impossible on ROM based systems. Do you think a copy is doable? Just a thought.
security/security.c line 110
Quoted 2 lines
security/security.c +0
-0if (verify (ops)) { printk (KERN_INFO "%s could not verify "
When ops is NULL, this check is too late.
security/security.c line 169
Quoted 9 lines
security/security.c +2
-0@@ -162,6 +162,8 @@*/ int mod_reg_security (const char *name,struct security_operations *ops) { +security_fixup_ops (ops); +if (verify (ops)) {printk (KERN_INFO "%s could not verify " "security operations.\n" , __FUNCTION__);
Same here.
Nevertheless, I like this patch.
Regards, Olaf.
Quoted 3 lines · Olaf Dietsche
Quoted 1 line
VERIFY_STRUCT(struct security_operations, ops, err);This shouldn't be necessary anymore.
Good point, I'll remove it. It was a hack anyway :)
Quoted 3 lines
You're patching other people's data structures. Not everybody may like this. Maybe it's even impossible on ROM based systems. Do you think a copy is doable? Just a thought.
Does the kernel work if data structures are in ROM? I would think that lots of variables in the kernel would have this problem :)
And yes, patching other people's data structures isn't the nicest thing to do, but it was the simplest proposal I've come up with so far (we've had a lot of other pretty "odd" proposals for this problem in the past.)
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +0
-0if (verify (ops)) { printk (KERN_INFO "%s could not verify "When ops is NULL, this check is too late.
Oops, forgot that, I'll go fix it up.
thanks,
greg k-h
Quoted 2 lines · Greg KH
Does the kernel work if data structures are in ROM? I would think that lots of variables in the kernel would have this problem :)
The nommu ports support .text in rom. SGI NUMA plattforms support kernel text replication which has the same problems.
Quoted 5 lines · Christoph Hellwig
Quoted 2 lines · Greg KH
Does the kernel work if data structures are in ROM? I would think that lots of variables in the kernel would have this problem :)
The nommu ports support .text in rom.
But doesn't initialized variables live in .bss? So we should be ok, right?
thanks,
greg k-h
Quoted 9 lines · Greg KH
Quoted 5 lines · Christoph Hellwig
Quoted 2 lines · Greg KH
Does the kernel work if data structures are in ROM? I would think that lots of variables in the kernel would have this problem :)
The nommu ports support .text in rom.
But doesn't initialized variables live in .bss? So we should be ok, right?
Greg-
not that I am trying to be a PITA but where did you get the information that initialized variables live in .bss?
Initialized variables live in .data, the .bss (Block Started by Symbol) is reserved for non-initialized variables.
Look:
visitor@satelite:~> cat a.c
int first_var;
int second_var = 5;
visitor@satelite:~> gcc -S a.c
visitor@satelite:~> cat a.s
.file "a.c"
.globl second_var
.data
.align 4
.type second_var,@object
.size second_var,4second_var:
.long 5
.comm first_var,4,4
.ident "GCC: (GNU) 3.2"visitor@satelite:~>
Signature · 2 lines
Peace can only come as a natural consequence of universal enlightenment. -Dr. Nikola Tesla
Quoted 3 lines · Dragan Stancevic
not that I am trying to be a PITA but where did you get the information that initialized variables live in .bss?
I was incorrect, as was pointed out to me about 15 minutes after sending that email :)
thanks,
greg k-h
Quoted 6 lines · Greg KH
Quoted 2 lines · Dragan Stancevic
not that I am trying to be a PITA but where did you get the information that initialized variables live in .bss?
I was incorrect, as was pointed out to me about 15 minutes after sending that email :)
Oh sorry, I didn't catch that, 13000 emails unread.
Signature · 2 lines
Peace can only come as a natural consequence of universal enlightenment. -Dr. Nikola Tesla
Quoted 7 lines · Greg KH
Quoted 3 lines · Olaf Dietsche
Quoted 1 line
VERIFY_STRUCT(struct security_operations, ops, err);This shouldn't be necessary anymore.
Good point, I'll remove it. It was a hack anyway :)
I think we still want to make sure that the module author has explicitly accounted for all of the hooks, in case new hooks are added.
- James
Signature · 2 lines
James Morris <[email protected]>
Quoted 5 lines · James Morris
Quoted 3 lines · Greg KH
Quoted 2 lines · Olaf Dietsche
Quoted 1 line
VERIFY_STRUCT(struct security_operations, ops, err);
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
This shouldn't be necessary anymore.
Good point, I'll remove it. It was a hack anyway :)
I think we still want to make sure that the module author has explicitly accounted for all of the hooks, in case new hooks are added.
But with this patch, if the module author hasn't specified a hook, they get the "dummy" ones. So the structure should always be full of pointers, making the VERIFY_STRUCT macro pointless.
thanks,
greg k-h
Quoted 6 lines · Greg KH
Quoted 2 lines
I think we still want to make sure that the module author has explicitly accounted for all of the hooks, in case new hooks are added.
But with this patch, if the module author hasn't specified a hook, they get the "dummy" ones. So the structure should always be full of pointers, making the
VERIFY_STRUCTmacro pointless.
Yes, but defaulting unspecified hooks to dummy operations could be dangerous. A module might appear to compile and run perfectly well, but be missing some important new hook.
- James
Signature · 2 lines
James Morris <[email protected]>
Quoted 5 lines · James Morris
Quoted 3 lines · Greg KH
Quoted 2 lines
I think we still want to make sure that the module author has explicitly accounted for all of the hooks, in case new hooks are added.
Quoted 7 lines
Quoted 3 lines
But with this patch, if the module author hasn't specified a hook, they get the "dummy" ones. So the structure should always be full of pointers, making the
VERIFY_STRUCTmacro pointless.Yes, but defaulting unspecified hooks to dummy operations could be dangerous. A module might appear to compile and run perfectly well, but be missing some important new hook.
One could argue that a "important new hook" would provide a sane dummy operation, or that if the module doesn't need it, why would it want to provide it? :)
Anyway, there's no way to resolve both this percieved problem, and the "smaller and easier" patch that I proposed, right? Unless we want to export all dummy operation functions for all modules to use? I could do that, but it's pretty messy...
thanks,
greg k-h
Quoted 4 lines · Greg KH
Anyway, there's no way to resolve both this percieved problem, and the "smaller and easier" patch that I proposed, right? Unless we want to export all dummy operation functions for all modules to use? I could do that, but it's pretty messy...
Yeah, very. I guess a security module could check the kernel version and print a warning to the effect "this module has not been verified with this kernel version" either at compile or runtime, if needed.
- James
Signature · 2 lines
James Morris <[email protected]>
Quoted 5 lines · James Morris
Quoted 3 lines · Greg KH
Quoted 2 lines · Olaf Dietsche
Quoted 1 line
VERIFY_STRUCT(struct security_operations, ops, err);
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
This shouldn't be necessary anymore.
Good point, I'll remove it. It was a hack anyway :)
I think we still want to make sure that the module author has explicitly accounted for all of the hooks, in case new hooks are added.
VERIFY_STRUCT() now verifies, wether security_fixup_ops() has done its job. So it does no harm, but it is useless, nevertheless.
If you want to check, wether a module has been recompiled, you should add a length/sizeof(struct security_operations) parameter.
Regards, Olaf.
Quoted 3 lines · Olaf Dietsche
If you want to check, wether a module has been recompiled, you should add a length/sizeof(struct
security_operations) parameter.
No, I don't want to go down that path. All security modules need to be compiled against the exact kernel version they are going to be used for, like any other kernel module type.
thanks,
greg k-h
RFC 1/1 LSM fix for stupid "empty" functions - take 2
In reply to Greg KHHi all,
Here's an updated version of the previous patch I sent out. It incorporates all of the different changes people made.
If there aren't any objections, I'll be sending this out to Linus soon.
thanks,
greg k-h
===== security/capability.c 1.10 vs edited =====
security/capability.c +0 -530
@@ -279,550 +279,20 @@#ifdef CONFIG_SECURITY -static int cap_quotactl (int cmds,int type,int id,struct super_block *sb) -{ -return 0 ; -} - -static int cap_quota_on (struct file *f) -{ -return 0 ; -} - -static int cap_acct (struct file *file) -{ -return 0 ; -} - -static int cap_bprm_alloc_security (struct linux_binprm *bprm) -{ -return 0 ; -} - -static int cap_bprm_check_security (struct linux_binprm *bprm) -{ -return 0 ; -} - -static void cap_bprm_free_security (struct linux_binprm *bprm) -{ -return ; -} - -static int cap_sb_alloc_security (struct super_block *sb) -{ -return 0 ; -} - -static void cap_sb_free_security (struct super_block *sb) -{ -return ; -} - -static int cap_sb_statfs (struct super_block *sb) -{ -return 0 ; -} - -static int cap_mount (char *dev_name,struct nameidata *nd,char *type, -unsigned long flags,void *data) -{ -return 0 ; -} - -static int cap_check_sb (struct vfsmount *mnt,struct nameidata *nd) -{ -return 0 ; -} - -static int cap_umount (struct vfsmount *mnt,int flags) -{ -return 0 ; -} - -static void cap_umount_close (struct vfsmount *mnt) -{ -return ; -} - -static void cap_umount_busy (struct vfsmount *mnt) -{ -return ; -} - -static void cap_post_remount (struct vfsmount *mnt,unsigned long flags, -void *data) -{ -return ; -} - -static void cap_post_mountroot (void ) -{ -return ; -} - -static void cap_post_addmount (struct vfsmount *mnt,struct nameidata *nd) -{ -return ; -} - -static int cap_pivotroot (struct nameidata *old_nd,struct nameidata *new_nd) -{ -return 0 ; -} - -static void cap_post_pivotroot (struct nameidata *old_nd,struct nameidata *new_nd) -{ -return ; -} - -static int cap_inode_alloc_security (struct inode *inode) -{ -return 0 ; -} - -static void cap_inode_free_security (struct inode *inode) -{ -return ; -} - -static int cap_inode_create (struct inode *inode,struct dentry *dentry, -int mask) -{ -return 0 ; -} - -static void cap_inode_post_create (struct inode *inode,struct dentry *dentry, -int mask) -{ -return ; -} - -static int cap_inode_link (struct dentry *old_dentry,struct inode *inode, -struct dentry *new_dentry) -{ -return 0 ; -} - -static void cap_inode_post_link (struct dentry *old_dentry,struct inode *inode, -struct dentry *new_dentry) -{ -return ; -} - -static int cap_inode_unlink (struct inode *inode,struct dentry *dentry) -{ -return 0 ; -} - -static int cap_inode_symlink (struct inode *inode,struct dentry *dentry, -const char *name) -{ -return 0 ; -} - -static void cap_inode_post_symlink (struct inode *inode,struct dentry *dentry, -const char *name) -{ -return ; -} - -static int cap_inode_mkdir (struct inode *inode,struct dentry *dentry, -int mask) -{ -return 0 ; -} - -static void cap_inode_post_mkdir (struct inode *inode,struct dentry *dentry, -int mask) -{ -return ; -} - -static int cap_inode_rmdir (struct inode *inode,struct dentry *dentry) -{ -return 0 ; -} - -static int cap_inode_mknod (struct inode *inode,struct dentry *dentry, -int mode,dev_t dev) -{ -return 0 ; -} - -static void cap_inode_post_mknod (struct inode *inode,struct dentry *dentry, -int mode,dev_t dev) -{ -return ; -} - -static int cap_inode_rename (struct inode *old_inode,struct dentry *old_dentry, -struct inode *new_inode,struct dentry *new_dentry) -{ -return 0 ; -} - -static void cap_inode_post_rename (struct inode *old_inode, -struct dentry *old_dentry, -struct inode *new_inode, -struct dentry *new_dentry) -{ -return ; -} - -static int cap_inode_readlink (struct dentry *dentry) -{ -return 0 ; -} - -static int cap_inode_follow_link (struct dentry *dentry, -struct nameidata *nameidata) -{ -return 0 ; -} - -static int cap_inode_permission (struct inode *inode,int mask) -{ -return 0 ; -} - -static int cap_inode_permission_lite (struct inode *inode,int mask) -{ -return 0 ; -} - -static int cap_inode_setattr (struct dentry *dentry,struct iattr *iattr) -{ -return 0 ; -} - -static int cap_inode_getattr (struct vfsmount *mnt,struct dentry *dentry) -{ -return 0 ; -} - -static void cap_post_lookup (struct inode *ino,struct dentry *d) -{ -return ; -} - -static void cap_delete (struct inode *ino) -{ -return ; -} - -static int cap_inode_setxattr (struct dentry *dentry,char *name,void *value, -size_t size,int flags) -{ -return 0 ; -} - -static int cap_inode_getxattr (struct dentry *dentry,char *name) -{ -return 0 ; -} - -static int cap_inode_listxattr (struct dentry *dentry) -{ -return 0 ; -} - -static int cap_inode_removexattr (struct dentry *dentry,char *name) -{ -return 0 ; -} - -static int cap_file_permission (struct file *file,int mask) -{ -return 0 ; -} - -static int cap_file_alloc_security (struct file *file) -{ -return 0 ; -} - -static void cap_file_free_security (struct file *file) -{ -return ; -} - -static int cap_file_ioctl (struct file *file,unsigned int command, -unsigned long arg) -{ -return 0 ; -} - -static int cap_file_mmap (struct file *file,unsigned long prot, -unsigned long flags) -{ -return 0 ; -} - -static int cap_file_mprotect (struct vm_area_struct *vma,unsigned long prot) -{ -return 0 ; -} - -static int cap_file_lock (struct file *file,unsigned int cmd) -{ -return 0 ; -} - -static int cap_file_fcntl (struct file *file,unsigned int cmd, -unsigned long arg) -{ -return 0 ; -} - -static int cap_file_set_fowner (struct file *file) -{ -return 0 ; -} - -static int cap_file_send_sigiotask (struct task_struct *tsk, -struct fown_struct *fown,int fd, -int reason) -{ -return 0 ; -} - -static int cap_file_receive (struct file *file) -{ -return 0 ; -} - -static int cap_task_create (unsigned long clone_flags) -{ -return 0 ; -} - -static int cap_task_alloc_security (struct task_struct *p) -{ -return 0 ; -} - -static void cap_task_free_security (struct task_struct *p) -{ -return ; -} - -static int cap_task_setuid (uid_t id0,uid_t id1,uid_t id2,int flags) -{ -return 0 ; -} - -static int cap_task_setgid (gid_t id0,gid_t id1,gid_t id2,int flags) -{ -return 0 ; -} - -static int cap_task_setpgid (struct task_struct *p,pid_t pgid) -{ -return 0 ; -} - -static int cap_task_getpgid (struct task_struct *p) -{ -return 0 ; -} - -static int cap_task_getsid (struct task_struct *p) -{ -return 0 ; -} - -static int cap_task_setgroups (int gidsetsize,gid_t * grouplist) -{ -return 0 ; -} - -static int cap_task_setnice (struct task_struct *p,int nice) -{ -return 0 ; -} - -static int cap_task_setrlimit (unsigned int resource,struct rlimit *new_rlim) -{ -return 0 ; -} - -static int cap_task_setscheduler (struct task_struct *p,int policy, -struct sched_param *lp) -{ -return 0 ; -} - -static int cap_task_getscheduler (struct task_struct *p) -{ -return 0 ; -} - -static int cap_task_wait (struct task_struct *p) -{ -return 0 ; -} - -static int cap_task_kill (struct task_struct *p,struct siginfo *info,int sig) -{ -return 0 ; -} - -static int cap_task_prctl (int option,unsigned long arg2,unsigned long arg3, -unsigned long arg4,unsigned long arg5) -{ -return 0 ; -} - -static int cap_ipc_permission (struct kern_ipc_perm *ipcp,short flag) -{ -return 0 ; -} - -static int cap_msg_queue_alloc_security (struct msg_queue *msq) -{ -return 0 ; -} - -static void cap_msg_queue_free_security (struct msg_queue *msq) -{ -return ; -} - -static int cap_shm_alloc_security (struct shmid_kernel *shp) -{ -return 0 ; -} - -static void cap_shm_free_security (struct shmid_kernel *shp) -{ -return ; -} - -static int cap_sem_alloc_security (struct sem_array *sma) -{ -return 0 ; -} - -static void cap_sem_free_security (struct sem_array *sma) -{ -return ; -} - -static int cap_register (const char *name,struct security_operations *ops) -{ -return -EINVAL ; -} - -static int cap_unregister (const char *name,struct security_operations *ops) -{ -return -EINVAL ; -}static struct security_operations capability_ops = { .ptrace = cap_ptrace, .capget = cap_capget, .capset_check = cap_capset_check, .capset_set = cap_capset_set, - .acct = cap_acct, .capable = cap_capable, - .quotactl = cap_quotactl, - .quota_on = cap_quota_on, - .bprm_alloc_security = cap_bprm_alloc_security, - .bprm_free_security = cap_bprm_free_security, .bprm_compute_creds = cap_bprm_compute_creds, .bprm_set_security = cap_bprm_set_security, - .bprm_check_security = cap_bprm_check_security, - - .sb_alloc_security = cap_sb_alloc_security, - .sb_free_security = cap_sb_free_security, - .sb_statfs = cap_sb_statfs, - .sb_mount = cap_mount, - .sb_check_sb = cap_check_sb, - .sb_umount = cap_umount, - .sb_umount_close = cap_umount_close, - .sb_umount_busy = cap_umount_busy, - .sb_post_remount = cap_post_remount, - .sb_post_mountroot = cap_post_mountroot, - .sb_post_addmount = cap_post_addmount, - .sb_pivotroot = cap_pivotroot, - .sb_post_pivotroot = cap_post_pivotroot, - - .inode_alloc_security = cap_inode_alloc_security, - .inode_free_security = cap_inode_free_security, - .inode_create = cap_inode_create, - .inode_post_create = cap_inode_post_create, - .inode_link = cap_inode_link, - .inode_post_link = cap_inode_post_link, - .inode_unlink = cap_inode_unlink, - .inode_symlink = cap_inode_symlink, - .inode_post_symlink = cap_inode_post_symlink, - .inode_mkdir = cap_inode_mkdir, - .inode_post_mkdir = cap_inode_post_mkdir, - .inode_rmdir = cap_inode_rmdir, - .inode_mknod = cap_inode_mknod, - .inode_post_mknod = cap_inode_post_mknod, - .inode_rename = cap_inode_rename, - .inode_post_rename = cap_inode_post_rename, - .inode_readlink = cap_inode_readlink, - .inode_follow_link = cap_inode_follow_link, - .inode_permission = cap_inode_permission, - .inode_permission_lite = cap_inode_permission_lite, - .inode_setattr = cap_inode_setattr, - .inode_getattr = cap_inode_getattr, - .inode_post_lookup = cap_post_lookup, - .inode_delete = cap_delete, - .inode_setxattr = cap_inode_setxattr, - .inode_getxattr = cap_inode_getxattr, - .inode_listxattr = cap_inode_listxattr, - .inode_removexattr = cap_inode_removexattr, - - .file_permission = cap_file_permission, - .file_alloc_security = cap_file_alloc_security, - .file_free_security = cap_file_free_security, - .file_ioctl = cap_file_ioctl, - .file_mmap = cap_file_mmap, - .file_mprotect = cap_file_mprotect, - .file_lock = cap_file_lock, - .file_fcntl = cap_file_fcntl, - .file_set_fowner = cap_file_set_fowner, - .file_send_sigiotask = cap_file_send_sigiotask, - .file_receive = cap_file_receive, - .task_create = cap_task_create, - .task_alloc_security = cap_task_alloc_security, - .task_free_security = cap_task_free_security, - .task_setuid = cap_task_setuid, .task_post_setuid = cap_task_post_setuid, - .task_setgid = cap_task_setgid, - .task_setpgid = cap_task_setpgid, - .task_getpgid = cap_task_getpgid, - .task_getsid = cap_task_getsid, - .task_setgroups = cap_task_setgroups, - .task_setnice = cap_task_setnice, - .task_setrlimit = cap_task_setrlimit, - .task_setscheduler = cap_task_setscheduler, - .task_getscheduler = cap_task_getscheduler, - .task_wait = cap_task_wait, - .task_kill = cap_task_kill, - .task_prctl = cap_task_prctl, .task_kmod_set_label = cap_task_kmod_set_label, .task_reparent_to_init = cap_task_reparent_to_init, - - .ipc_permission = cap_ipc_permission, - - .msg_queue_alloc_security = cap_msg_queue_alloc_security, - .msg_queue_free_security = cap_msg_queue_free_security, - - .shm_alloc_security = cap_shm_alloc_security, - .shm_free_security = cap_shm_free_security, - - .sem_alloc_security = cap_sem_alloc_security, - .sem_free_security = cap_sem_free_security, - - .register_security = cap_register, - .unregister_security = cap_unregister, };#if defined(CONFIG_SECURITY_CAPABILITIES_MODULE )
===== security/dummy.c 1.10 vs edited =====
security/dummy.c +139 -30
261 lines not on this page · raw message
===== security/security.c 1.4 vs edited =====
security/security.c +9 -44
86 lines not on this page · raw message
Re: [RFC] LSM fix for stupid "empty" functions - take 2
Quoted 2 lines · * Greg KH ([email protected]) wrote:
If there aren't any objections, I'll be sending this out to Linus soon.
Why did you uninline verify()? It actually increases the size of security.o:
w/ inline
$ size security/security.o text data bss dec hex filename 1925 0 4 1929 789 security/security.o
w/out inline
$ size security/security.o text data bss dec hex filename 1957 0 4 1961 7a9 security/security.o
Also, I think the fixup should go directly in verify, since they are always called together. Otherwise, this looks good. Thanks, it's been sorely needed.
thanks,
-chris
security/capability.c renamed from security/capability.c.lsm +0 -530
@@ -279,550 +279,20 @@#ifdef CONFIG_SECURITY -static int cap_quotactl (int cmds,int type,int id,struct super_block *sb) -{ -return 0 ; -} - -static int cap_quota_on (struct file *f) -{ -return 0 ; -} - -static int cap_acct (struct file *file) -{ -return 0 ; -} - -static int cap_bprm_alloc_security (struct linux_binprm *bprm) -{ -return 0 ; -} - -static int cap_bprm_check_security (struct linux_binprm *bprm) -{ -return 0 ; -} - -static void cap_bprm_free_security (struct linux_binprm *bprm) -{ -return ; -} - -static int cap_sb_alloc_security (struct super_block *sb) -{ -return 0 ; -} - -static void cap_sb_free_security (struct super_block *sb) -{ -return ; -} - -static int cap_sb_statfs (struct super_block *sb) -{ -return 0 ; -} - -static int cap_mount (char *dev_name,struct nameidata *nd,char *type, -unsigned long flags,void *data) -{ -return 0 ; -} - -static int cap_check_sb (struct vfsmount *mnt,struct nameidata *nd) -{ -return 0 ; -} - -static int cap_umount (struct vfsmount *mnt,int flags) -{ -return 0 ; -} - -static void cap_umount_close (struct vfsmount *mnt) -{ -return ; -} - -static void cap_umount_busy (struct vfsmount *mnt) -{ -return ; -} - -static void cap_post_remount (struct vfsmount *mnt,unsigned long flags, -void *data) -{ -return ; -} - -static void cap_post_mountroot (void ) -{ -return ; -} - -static void cap_post_addmount (struct vfsmount *mnt,struct nameidata *nd) -{ -return ; -} - -static int cap_pivotroot (struct nameidata *old_nd,struct nameidata *new_nd) -{ -return 0 ; -} - -static void cap_post_pivotroot (struct nameidata *old_nd,struct nameidata *new_nd) -{ -return ; -} - -static int cap_inode_alloc_security (struct inode *inode) -{ -return 0 ; -} - -static void cap_inode_free_security (struct inode *inode) -{ -return ; -} - -static int cap_inode_create (struct inode *inode,struct dentry *dentry, -int mask) -{ -return 0 ; -} - -static void cap_inode_post_create (struct inode *inode,struct dentry *dentry, -int mask) -{ -return ; -} - -static int cap_inode_link (struct dentry *old_dentry,struct inode *inode, -struct dentry *new_dentry) -{ -return 0 ; -} - -static void cap_inode_post_link (struct dentry *old_dentry,struct inode *inode, -struct dentry *new_dentry) -{ -return ; -} - -static int cap_inode_unlink (struct inode *inode,struct dentry *dentry) -{ -return 0 ; -} - -static int cap_inode_symlink (struct inode *inode,struct dentry *dentry, -const char *name) -{ -return 0 ; -} - -static void cap_inode_post_symlink (struct inode *inode,struct dentry *dentry, -const char *name) -{ -return ; -} - -static int cap_inode_mkdir (struct inode *inode,struct dentry *dentry, -int mask) -{ -return 0 ; -} - -static void cap_inode_post_mkdir (struct inode *inode,struct dentry *dentry, -int mask) -{ -return ; -} - -static int cap_inode_rmdir (struct inode *inode,struct dentry *dentry) -{ -return 0 ; -} - -static int cap_inode_mknod (struct inode *inode,struct dentry *dentry, -int mode,dev_t dev) -{ -return 0 ; -} - -static void cap_inode_post_mknod (struct inode *inode,struct dentry *dentry, -int mode,dev_t dev) -{ -return ; -} - -static int cap_inode_rename (struct inode *old_inode,struct dentry *old_dentry, -struct inode *new_inode,struct dentry *new_dentry) -{ -return 0 ; -} - -static void cap_inode_post_rename (struct inode *old_inode, -struct dentry *old_dentry, -struct inode *new_inode, -struct dentry *new_dentry) -{ -return ; -} - -static int cap_inode_readlink (struct dentry *dentry) -{ -return 0 ; -} - -static int cap_inode_follow_link (struct dentry *dentry, -struct nameidata *nameidata) -{ -return 0 ; -} - -static int cap_inode_permission (struct inode *inode,int mask) -{ -return 0 ; -} - -static int cap_inode_permission_lite (struct inode *inode,int mask) -{ -return 0 ; -} - -static int cap_inode_setattr (struct dentry *dentry,struct iattr *iattr) -{ -return 0 ; -} - -static int cap_inode_getattr (struct vfsmount *mnt,struct dentry *dentry) -{ -return 0 ; -} - -static void cap_post_lookup (struct inode *ino,struct dentry *d) -{ -return ; -} - -static void cap_delete (struct inode *ino) -{ -return ; -} - -static int cap_inode_setxattr (struct dentry *dentry,char *name,void *value, -size_t size,int flags) -{ -return 0 ; -} - -static int cap_inode_getxattr (struct dentry *dentry,char *name) -{ -return 0 ; -} - -static int cap_inode_listxattr (struct dentry *dentry) -{ -return 0 ; -} - -static int cap_inode_removexattr (struct dentry *dentry,char *name) -{ -return 0 ; -} - -static int cap_file_permission (struct file *file,int mask) -{ -return 0 ; -} - -static int cap_file_alloc_security (struct file *file) -{ -return 0 ; -} - -static void cap_file_free_security (struct file *file) -{ -return ; -} - -static int cap_file_ioctl (struct file *file,unsigned int command, -unsigned long arg) -{ -return 0 ; -} - -static int cap_file_mmap (struct file *file,unsigned long prot, -unsigned long flags) -{ -return 0 ; -} - -static int cap_file_mprotect (struct vm_area_struct *vma,unsigned long prot) -{ -return 0 ; -} - -static int cap_file_lock (struct file *file,unsigned int cmd) -{ -return 0 ; -} - -static int cap_file_fcntl (struct file *file,unsigned int cmd, -unsigned long arg) -{ -return 0 ; -} - -static int cap_file_set_fowner (struct file *file) -{ -return 0 ; -} - -static int cap_file_send_sigiotask (struct task_struct *tsk, -struct fown_struct *fown,int fd, -int reason) -{ -return 0 ; -} - -static int cap_file_receive (struct file *file) -{ -return 0 ; -} - -static int cap_task_create (unsigned long clone_flags) -{ -return 0 ; -} - -static int cap_task_alloc_security (struct task_struct *p) -{ -return 0 ; -} - -static void cap_task_free_security (struct task_struct *p) -{ -return ; -} - -static int cap_task_setuid (uid_t id0,uid_t id1,uid_t id2,int flags) -{ -return 0 ; -} - -static int cap_task_setgid (gid_t id0,gid_t id1,gid_t id2,int flags) -{ -return 0 ; -} - -static int cap_task_setpgid (struct task_struct *p,pid_t pgid) -{ -return 0 ; -} - -static int cap_task_getpgid (struct task_struct *p) -{ -return 0 ; -} - -static int cap_task_getsid (struct task_struct *p) -{ -return 0 ; -} - -static int cap_task_setgroups (int gidsetsize,gid_t * grouplist) -{ -return 0 ; -} - -static int cap_task_setnice (struct task_struct *p,int nice) -{ -return 0 ; -} - -static int cap_task_setrlimit (unsigned int resource,struct rlimit *new_rlim) -{ -return 0 ; -} - -static int cap_task_setscheduler (struct task_struct *p,int policy, -struct sched_param *lp) -{ -return 0 ; -} - -static int cap_task_getscheduler (struct task_struct *p) -{ -return 0 ; -} - -static int cap_task_wait (struct task_struct *p) -{ -return 0 ; -} - -static int cap_task_kill (struct task_struct *p,struct siginfo *info,int sig) -{ -return 0 ; -} - -static int cap_task_prctl (int option,unsigned long arg2,unsigned long arg3, -unsigned long arg4,unsigned long arg5) -{ -return 0 ; -} - -static int cap_ipc_permission (struct kern_ipc_perm *ipcp,short flag) -{ -return 0 ; -} - -static int cap_msg_queue_alloc_security (struct msg_queue *msq) -{ -return 0 ; -} - -static void cap_msg_queue_free_security (struct msg_queue *msq) -{ -return ; -} - -static int cap_shm_alloc_security (struct shmid_kernel *shp) -{ -return 0 ; -} - -static void cap_shm_free_security (struct shmid_kernel *shp) -{ -return ; -} - -static int cap_sem_alloc_security (struct sem_array *sma) -{ -return 0 ; -} - -static void cap_sem_free_security (struct sem_array *sma) -{ -return ; -} - -static int cap_register (const char *name,struct security_operations *ops) -{ -return -EINVAL ; -} - -static int cap_unregister (const char *name,struct security_operations *ops) -{ -return -EINVAL ; -}static struct security_operations capability_ops = { .ptrace = cap_ptrace, .capget = cap_capget, .capset_check = cap_capset_check, .capset_set = cap_capset_set, - .acct = cap_acct, .capable = cap_capable, - .quotactl = cap_quotactl, - .quota_on = cap_quota_on, - .bprm_alloc_security = cap_bprm_alloc_security, - .bprm_free_security = cap_bprm_free_security, .bprm_compute_creds = cap_bprm_compute_creds, .bprm_set_security = cap_bprm_set_security, - .bprm_check_security = cap_bprm_check_security, - - .sb_alloc_security = cap_sb_alloc_security, - .sb_free_security = cap_sb_free_security, - .sb_statfs = cap_sb_statfs, - .sb_mount = cap_mount, - .sb_check_sb = cap_check_sb, - .sb_umount = cap_umount, - .sb_umount_close = cap_umount_close, - .sb_umount_busy = cap_umount_busy, - .sb_post_remount = cap_post_remount, - .sb_post_mountroot = cap_post_mountroot, - .sb_post_addmount = cap_post_addmount, - .sb_pivotroot = cap_pivotroot, - .sb_post_pivotroot = cap_post_pivotroot, - - .inode_alloc_security = cap_inode_alloc_security, - .inode_free_security = cap_inode_free_security, - .inode_create = cap_inode_create, - .inode_post_create = cap_inode_post_create, - .inode_link = cap_inode_link, - .inode_post_link = cap_inode_post_link, - .inode_unlink = cap_inode_unlink, - .inode_symlink = cap_inode_symlink, - .inode_post_symlink = cap_inode_post_symlink, - .inode_mkdir = cap_inode_mkdir, - .inode_post_mkdir = cap_inode_post_mkdir, - .inode_rmdir = cap_inode_rmdir, - .inode_mknod = cap_inode_mknod, - .inode_post_mknod = cap_inode_post_mknod, - .inode_rename = cap_inode_rename, - .inode_post_rename = cap_inode_post_rename, - .inode_readlink = cap_inode_readlink, - .inode_follow_link = cap_inode_follow_link, - .inode_permission = cap_inode_permission, - .inode_permission_lite = cap_inode_permission_lite, - .inode_setattr = cap_inode_setattr, - .inode_getattr = cap_inode_getattr, - .inode_post_lookup = cap_post_lookup, - .inode_delete = cap_delete, - .inode_setxattr = cap_inode_setxattr, - .inode_getxattr = cap_inode_getxattr, - .inode_listxattr = cap_inode_listxattr, - .inode_removexattr = cap_inode_removexattr, - - .file_permission = cap_file_permission, - .file_alloc_security = cap_file_alloc_security, - .file_free_security = cap_file_free_security, - .file_ioctl = cap_file_ioctl, - .file_mmap = cap_file_mmap, - .file_mprotect = cap_file_mprotect, - .file_lock = cap_file_lock, - .file_fcntl = cap_file_fcntl, - .file_set_fowner = cap_file_set_fowner, - .file_send_sigiotask = cap_file_send_sigiotask, - .file_receive = cap_file_receive, - .task_create = cap_task_create, - .task_alloc_security = cap_task_alloc_security, - .task_free_security = cap_task_free_security, - .task_setuid = cap_task_setuid, .task_post_setuid = cap_task_post_setuid, - .task_setgid = cap_task_setgid, - .task_setpgid = cap_task_setpgid, - .task_getpgid = cap_task_getpgid, - .task_getsid = cap_task_getsid, - .task_setgroups = cap_task_setgroups, - .task_setnice = cap_task_setnice, - .task_setrlimit = cap_task_setrlimit, - .task_setscheduler = cap_task_setscheduler, - .task_getscheduler = cap_task_getscheduler, - .task_wait = cap_task_wait, - .task_kill = cap_task_kill, - .task_prctl = cap_task_prctl, .task_kmod_set_label = cap_task_kmod_set_label, .task_reparent_to_init = cap_task_reparent_to_init, - - .ipc_permission = cap_ipc_permission, - - .msg_queue_alloc_security = cap_msg_queue_alloc_security, - .msg_queue_free_security = cap_msg_queue_free_security, - - .shm_alloc_security = cap_shm_alloc_security, - .shm_free_security = cap_shm_free_security, - - .sem_alloc_security = cap_sem_alloc_security, - .sem_free_security = cap_sem_free_security, - - .register_security = cap_register, - .unregister_security = cap_unregister, };#if defined(CONFIG_SECURITY_CAPABILITIES_MODULE )
security/dummy.c renamed from security/dummy.c.lsm +139 -30
261 lines not on this page · raw message
security/security.c renamed from security/security.c.lsm +6 -44
77 lines not on this page · raw message
Re: [RFC] LSM fix for stupid "empty" functions - take 2
Quoted 4 lines · Chris Wright
Also, I think the fixup should go directly in verify, since they are always called together. Otherwise, this looks good. Thanks, it's been sorely needed.
Thanks for the changes, I'll use your version of this :)
greg k-h
Re: [RFC] LSM fix for stupid "empty" functions - take 2
Quoted 7 lines · * Greg KH ([email protected]) wrote:
Quoted 4 lines · Chris Wright
Also, I think the fixup should go directly in verify, since they are always called together. Otherwise, this looks good. Thanks, it's been sorely needed.
Thanks for the changes, I'll use your version of this :)
alright, thanks.
-chris
Signature · 1 line
Linux Security Modules http://lsm.immunix.org http://lsm.bkbits.net
Re: [RFC] LSM fix for stupid "empty" functions - take 2
In reply to Greg KHQuoted 6 lines · Greg KH
Hi all,
Here's an updated version of the previous patch I sent out. It incorporates all of the different changes people made.
If there aren't any objections, I'll be sending this out to Linus soon.
Looks good, with Chris' additions. The hook verification issue I raised earlier is a non-issue: it might be useful, but can be addressed in other ways by module authors if needed without uglifying the mainline code.
Thanks for doing this work Greg.
- James
Signature · 2 lines
James Morris <[email protected]>