Add missing consts to xattr function arguments
Subsystems (6)
Add missing consts to xattr function arguments.
Signed-off-by David Howells <[email protected]>
---
fs/xattr.c | 41 ++++++++++++++++--------------- include/linux/security.h | 46 ++++++++++++++++++++--------------- include/linux/syscalls.h | 30 ++++++++++++----------- include/linux/xattr.h | 6 ++--- security/commoncap.c | 6 ++--- security/dummy.c | 13 +++++----- security/security.c | 12 +++++---- security/selinux/hooks.c | 14 ++++++----- security/selinux/include/security.h | 2 +- security/selinux/ss/services.c | 5 ++-- security/smack/smack_lsm.c | 12 +++++---- 11 files changed, 100 insertions(+), 87 deletions(-)
fs/xattr.c +21 -20
@@ -68,7 +68,7 @@ xattr_permission(struct inode *inode, const char *name, int mask) }int -vfs_setxattr (struct dentry *dentry,char *name,void *value, +vfs_setxattr (struct dentry *dentry,const char *name,const void *value,size_t size,int flags) {struct inode *inode = dentry->d_inode;
@@ -132,7 +132,7 @@ out_noalloc:EXPORT_SYMBOL_GPL (xattr_getsecurity);ssize_t -vfs_getxattr (struct dentry *dentry,char *name,void *value,size_t size) +vfs_getxattr (struct dentry *dentry,const char *name,void *value,size_t size) {struct inode *inode = dentry->d_inode;int error;
@@ -188,7 +188,7 @@ vfs_listxattr(struct dentry *d, char *list, size_t size)EXPORT_SYMBOL_GPL (vfs_listxattr);int -vfs_removexattr (struct dentry *dentry,char *name) +vfs_removexattr (struct dentry *dentry,const char *name) {struct inode *inode = dentry->d_inode;int error;
@@ -219,7 +219,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);* Extended attribute SET operations */ static long -setxattr (struct dentry *d,char __user *name,void __user *value, +setxattr (struct dentry *d,const char __user *name,const void __user *value,size_t size,int flags) {int error;
@@ -253,8 +253,8 @@ setxattr(struct dentry *d, char __user *name, void __user *value, }asmlinkage long -sys_setxattr (char __user *path,char __user *name,void __user *value, -size_t size,int flags) +sys_setxattr (const char __user *path,const char __user *name, +const void __user *value,size_t size,int flags) {struct nameidata nd;int error;
@@ -268,8 +268,8 @@ sys_setxattr(char __user *path, char __user *name, void __user *value, }asmlinkage long -sys_lsetxattr (char __user *path,char __user *name,void __user *value, -size_t size,int flags) +sys_lsetxattr (const char __user *path,const char __user *name, +const void __user *value,size_t size,int flags) {struct nameidata nd;int error;
@@ -283,7 +283,7 @@ sys_lsetxattr(char __user *path, char __user *name, void __user *value, }asmlinkage long -sys_fsetxattr (int fd,char __user *name,void __user *value, +sys_fsetxattr (int fd,const char __user *name,const void __user *value,size_t size,int flags) {struct file *f;
@@ -304,7 +304,8 @@ sys_fsetxattr(int fd, char __user *name, void __user *value,* Extended attribute GET operations */ static ssize_t -getxattr (struct dentry *d,char __user *name,void __user *value,size_t size) +getxattr (struct dentry *d,const char __user *name,void __user *value, +size_t size) {ssize_t error;void *kvalue =NULL ;
@@ -338,8 +339,8 @@ getxattr(struct dentry *d, char __user *name, void __user *value, size_t size) } asmlinkage ssize_t -sys_getxattr (char __user *path,char __user *name,void __user *value, -size_t size) +sys_getxattr (const char __user *path,const char __user *name, +void __user *value,size_t size) {struct nameidata nd;ssize_t error;
@@ -353,7 +354,7 @@ sys_getxattr(char __user *path, char __user *name, void __user *value, } asmlinkage ssize_t -sys_lgetxattr (char __user *path,char __user *name,void __user *value, +sys_lgetxattr (const char __user *path,const char __user *name,void __user *value,size_t size) {struct nameidata nd;
@@ -368,7 +369,7 @@ sys_lgetxattr(char __user *path, char __user *name, void __user *value, } asmlinkage ssize_t -sys_fgetxattr (int fd,char __user *name,void __user *value,size_t size) +sys_fgetxattr (int fd,const char __user *name,void __user *value,size_t size) {struct file *f;ssize_t error = -EBADF ;
@@ -413,7 +414,7 @@ listxattr(struct dentry *d, char __user *list, size_t size) } asmlinkage ssize_t -sys_listxattr (char __user *path,char __user *list,size_t size) +sys_listxattr (const char __user *path,char __user *list,size_t size) {struct nameidata nd;ssize_t error;
@@ -427,7 +428,7 @@ sys_listxattr(char __user *path, char __user *list, size_t size) } asmlinkage ssize_t -sys_llistxattr (char __user *path,char __user *list,size_t size) +sys_llistxattr (const char __user *path,char __user *list,size_t size) {struct nameidata nd;ssize_t error;
@@ -459,7 +460,7 @@ sys_flistxattr(int fd, char __user *list, size_t size)* Extended attribute REMOVE operations */ static long -removexattr (struct dentry *d,char __user *name) +removexattr (struct dentry *d,const char __user *name) {int error;char kname[XATTR_NAME_MAX +1 ];
@@ -474,7 +475,7 @@ removexattr(struct dentry *d, char __user *name) }asmlinkage long -sys_removexattr (char __user *path,char __user *name) +sys_removexattr (const char __user *path,const char __user *name) {struct nameidata nd;int error;
@@ -488,7 +489,7 @@ sys_removexattr(char __user *path, char __user *name) }asmlinkage long -sys_lremovexattr (char __user *path,char __user *name) +sys_lremovexattr (const char __user *path,const char __user *name) {struct nameidata nd;int error;
@@ -502,7 +503,7 @@ sys_lremovexattr(char __user *path, char __user *name) }asmlinkage long -sys_fremovexattr (int fd,char __user *name) +sys_fremovexattr (int fd,const char __user *name) {struct file *f;struct dentry *dentry;
include/linux/security.h +26 -20
84 lines not on this page · raw message
include/linux/syscalls.h +16 -14
@@ -241,26 +241,28 @@ asmlinkage long sys_truncate64(const char __user *path, loff_t length);asmlinkage long sys_ftruncate64 (unsigned int fd,loff_t length);#endif -asmlinkage long sys_setxattr (char __user *path,char __user *name, -void __user *value,size_t size,int flags); -asmlinkage long sys_lsetxattr (char __user *path,char __user *name, -void __user *value,size_t size,int flags); -asmlinkage long sys_fsetxattr (int fd,char __user *name,void __user *value, -size_t size,int flags); -asmlinkage ssize_t sys_getxattr(char __user *path, char __user *name, +asmlinkage long sys_setxattr (const char __user *path,const char __user *name, +const void __user *value,size_t size,int flags); +asmlinkage long sys_lsetxattr (const char __user *path,const char __user *name, +const void __user *value,size_t size,int flags); +asmlinkage long sys_fsetxattr (int fd,const char __user *name, +const void __user *value,size_t size,int flags); +asmlinkage ssize_t sys_getxattr(const char __user *path, const char __user *name,void __user *value,size_t size); -asmlinkage ssize_t sys_lgetxattr(char __user *path, char __user *name, +asmlinkage ssize_t sys_lgetxattr(const char __user *path, const char __user *name,void __user *value,size_t size); -asmlinkage ssize_t sys_fgetxattr(int fd, char __user *name, +asmlinkage ssize_t sys_fgetxattr(int fd, const char __user *name,void __user *value,size_t size); -asmlinkage ssize_t sys_listxattr(char __user *path, char __user *list, +asmlinkage ssize_t sys_listxattr(const char __user *path, char __user *list,size_t size); -asmlinkage ssize_t sys_llistxattr(char __user *path, char __user *list, +asmlinkage ssize_t sys_llistxattr(const char __user *path, char __user *list,size_t size); asmlinkage ssize_t sys_flistxattr(int fd, char __user *list, size_t size); -asmlinkage long sys_removexattr (char __user *path,char __user *name); -asmlinkage long sys_lremovexattr (char __user *path,char __user *name); -asmlinkage long sys_fremovexattr (int fd,char __user *name); +asmlinkage long sys_removexattr (const char __user *path, +const char __user *name); +asmlinkage long sys_lremovexattr (const char __user *path, +const char __user *name); +asmlinkage long sys_fremovexattr (int fd,const char __user *name);asmlinkage unsigned long sys_brk (unsigned long brk); asmlinkage long sys_mprotect(unsigned long start, size_t len,
include/linux/xattr.h +3 -3
@@ -47,10 +47,10 @@ struct xattr_handler { };ssize_t xattr_getsecurity (struct inode *,const char *,void *,size_t ); -ssize_t vfs_getxattr (struct dentry *,char *,void *,size_t ); +ssize_t vfs_getxattr (struct dentry *,const char *,void *,size_t );ssize_t vfs_listxattr (struct dentry *d,char *list,size_t size); -int vfs_setxattr (struct dentry *,char *,void *,size_t ,int ); -int vfs_removexattr (struct dentry *,char *); +int vfs_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +int vfs_removexattr (struct dentry *,const char *);ssize_t generic_getxattr (struct dentry *dentry,const char *name,void *buffer,size_t size);ssize_t generic_listxattr (struct dentry *dentry,char *buffer,size_t buffer_size);
security/commoncap.c +3 -3
@@ -386,8 +386,8 @@ int cap_bprm_secureexec (struct linux_binprm *bprm) current->egid != current->gid); } -int cap_inode_setxattr (struct dentry *dentry,char *name,void *value, -size_t size,int flags) +int cap_inode_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {if (!strcmp (name,XATTR_NAME_CAPS )) {if (!capable (CAP_SETFCAP ))
@@ -400,7 +400,7 @@ int cap_inode_setxattr(struct dentry *dentry, char *name, void *value,return 0 ; } -int cap_inode_removexattr (struct dentry *dentry,char *name) +int cap_inode_removexattr (struct dentry *dentry,const char *name) {if (!strcmp (name,XATTR_NAME_CAPS )) {if (!capable (CAP_SETFCAP ))
security/dummy.c +7 -6
@@ -365,8 +365,8 @@ static void dummy_inode_delete (struct inode *ino)return ; } -static int dummy_inode_setxattr (struct dentry *dentry,char *name,void *value, -size_t size,int flags) +static int dummy_inode_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) { if (!strncmp(name, XATTR_SECURITY_PREFIX, sizeof(XATTR_SECURITY_PREFIX) - 1) &&
@@ -375,12 +375,13 @@ static int dummy_inode_setxattr (struct dentry *dentry, char *name, void *value,return 0 ; } -static void dummy_inode_post_setxattr (struct dentry *dentry,char *name,void *value, -size_t size,int flags) +static void dummy_inode_post_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size, +int flags) { } -static int dummy_inode_getxattr (struct dentry *dentry,char *name) +static int dummy_inode_getxattr (struct dentry *dentry,const char *name) {return 0 ; }
@@ -390,7 +391,7 @@ static int dummy_inode_listxattr (struct dentry *dentry)return 0 ; } -static int dummy_inode_removexattr (struct dentry *dentry,char *name) +static int dummy_inode_removexattr (struct dentry *dentry,const char *name) { if (!strncmp(name, XATTR_SECURITY_PREFIX, sizeof(XATTR_SECURITY_PREFIX) - 1) &&
security/security.c +6 -6
@@ -455,23 +455,23 @@ void security_inode_delete(struct inode *inode) security_ops->inode_delete (inode); } -int security_inode_setxattr (struct dentry *dentry,char *name, -void *value,size_t size,int flags) +int security_inode_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {if (unlikely (IS_PRIVATE (dentry->d_inode)))return 0 ;return security_ops->inode_setxattr (dentry, name, value, size, flags); } -void security_inode_post_setxattr (struct dentry *dentry,char *name, -void *value,size_t size,int flags) +void security_inode_post_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {if (unlikely (IS_PRIVATE (dentry->d_inode)))return ; security_ops->inode_post_setxattr (dentry, name, value, size, flags); } -int security_inode_getxattr (struct dentry *dentry,char *name) +int security_inode_getxattr (struct dentry *dentry,const char *name) {if (unlikely (IS_PRIVATE (dentry->d_inode)))return 0 ;
@@ -485,7 +485,7 @@ int security_inode_listxattr(struct dentry *dentry)return security_ops->inode_listxattr (dentry); } -int security_inode_removexattr (struct dentry *dentry,char *name) +int security_inode_removexattr (struct dentry *dentry,const char *name) {if (unlikely (IS_PRIVATE (dentry->d_inode)))return 0 ;
security/selinux/hooks.c +8 -6
@@ -2555,7 +2555,7 @@ static int selinux_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)return dentry_has_perm (current, mnt, dentry,FILE__GETATTR ); } -static int selinux_inode_setotherxattr (struct dentry *dentry,char *name) +static int selinux_inode_setotherxattr (struct dentry *dentry,const char *name) {if (!strncmp (name,XATTR_SECURITY_PREFIX ,sizeof XATTR_SECURITY_PREFIX -1 )) {
@@ -2574,7 +2574,8 @@ static int selinux_inode_setotherxattr(struct dentry *dentry, char *name)return dentry_has_perm (current,NULL , dentry,FILE__SETATTR ); } -static int selinux_inode_setxattr (struct dentry *dentry,char *name,void *value,size_t size,int flags) +static int selinux_inode_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {struct task_security_struct *tsec = current->security;struct inode *inode = dentry->d_inode;
@@ -2623,8 +2624,9 @@ static int selinux_inode_setxattr(struct dentry *dentry, char *name, void *value &ad); } -static void selinux_inode_post_setxattr (struct dentry *dentry,char *name, -void *value,size_t size,int flags) +static void selinux_inode_post_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size, +int flags) {struct inode *inode = dentry->d_inode;struct inode_security_struct *isec = inode->i_security;
@@ -2647,7 +2649,7 @@ static void selinux_inode_post_setxattr(struct dentry *dentry, char *name,return ; } -static int selinux_inode_getxattr (struct dentry *dentry,char *name) +static int selinux_inode_getxattr (struct dentry *dentry,const char *name) {return dentry_has_perm (current,NULL , dentry,FILE__GETATTR ); }
@@ -2657,7 +2659,7 @@ static int selinux_inode_listxattr (struct dentry *dentry)return dentry_has_perm (current,NULL , dentry,FILE__GETATTR ); } -static int selinux_inode_removexattr (struct dentry *dentry,char *name) +static int selinux_inode_removexattr (struct dentry *dentry,const char *name) {if (strcmp (name,XATTR_NAME_SELINUX ))return selinux_inode_setotherxattr (dentry, name);
security/selinux/include/security.h +1 -1
@@ -83,7 +83,7 @@ int security_change_sid(u32 ssid, u32 tsid,int security_sid_to_context (u32 sid,char **scontext,u32 *scontext_len); -int security_context_to_sid (char *scontext,u32 scontext_len, +int security_context_to_sid (const char *scontext,u32 scontext_len,u32 *out_sid);int security_context_to_sid_default (char *scontext,u32 scontext_len,u32 *out_sid,u32 def_sid);
security/selinux/ss/services.c +3 -2
@@ -680,7 +680,8 @@ out: } -static int security_context_to_sid_core (char *scontext,u32 scontext_len,u32 *sid,u32 def_sid) +static int security_context_to_sid_core (const char *scontext,u32 scontext_len, +u32 *sid,u32 def_sid) {char *scontext2;struct context context;
@@ -806,7 +807,7 @@ out:* Returns -%EINVAL if the context is invalid, -%ENOMEM if insufficient * memory is available, or 0 on success. */ -int security_context_to_sid (char *scontext,u32 scontext_len,u32 *sid) +int security_context_to_sid (const char *scontext,u32 scontext_len,u32 *sid) {return security_context_to_sid_core (scontext, scontext_len, sid,SECSID_NULL );
security/smack/smack_lsm.c +6 -6
@@ -574,8 +574,8 @@ static int smack_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)* * Returns 0 if access is permitted, an error code otherwise */ -static int smack_inode_setxattr (struct dentry *dentry,char *name, -void *value,size_t size,int flags) +static int smack_inode_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {int rc =0 ;
@@ -604,8 +604,8 @@ static int smack_inode_setxattr(struct dentry *dentry, char *name,* Set the pointer in the inode blob to the entry found * in the master label list. */ -static void smack_inode_post_setxattr (struct dentry *dentry,char *name, -void *value,size_t size,int flags) +static void smack_inode_post_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {struct inode_smack *isp;char *nsp;
@@ -641,7 +641,7 @@ static void smack_inode_post_setxattr(struct dentry *dentry, char *name,* * Returns 0 if access is permitted, an error code otherwise */ -static int smack_inode_getxattr (struct dentry *dentry,char *name) +static int smack_inode_getxattr (struct dentry *dentry,const char *name) {return smk_curacc (smk_of_inode (dentry->d_inode),MAY_READ ); }
@@ -655,7 +655,7 @@ static int smack_inode_getxattr(struct dentry *dentry, char *name)* * Returns 0 if access is permitted, an error code otherwise */ -static int smack_inode_removexattr (struct dentry *dentry,char *name) +static int smack_inode_removexattr (struct dentry *dentry,const char *name) {int rc =0 ;
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.