Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f0cfa52 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

xattr: add missing consts to function arguments 



Add missing consts to xattr function arguments.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Cc: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7ec02ef1

fs/xattr.c

+21 −20
Original line number Diff line number Diff line
@@ -67,7 +67,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;
@@ -131,7 +131,7 @@ xattr_getsecurity(struct inode *inode, const char *name, void *value, 
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;
@@ -187,7 +187,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;
@@ -218,7 +218,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;
@@ -252,8 +252,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;
@@ -271,8 +271,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;
@@ -290,7 +290,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;
@@ -315,7 +315,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;
@@ -349,8 +350,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;
@@ -364,7 +365,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;
@@ -379,7 +380,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;
@@ -424,7 +425,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;
@@ -438,7 +439,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;
@@ -470,7 +471,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];
@@ -485,7 +486,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;
@@ -503,7 +504,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;
@@ -521,7 +522,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

+23 −20
Original line number Diff line number Diff line
@@ -53,8 +53,9 @@ extern void cap_capset_set(struct task_struct *target, kernel_cap_t *effective, 
extern int cap_bprm_set_security(struct linux_binprm *bprm);

extern void cap_bprm_apply_creds(struct linux_binprm *bprm, int unsafe);

extern int cap_bprm_secureexec(struct linux_binprm *bprm);

extern int cap_inode_setxattr(struct dentry *dentry, char *name, void *value, size_t size, int flags);

extern int cap_inode_removexattr(struct dentry *dentry, char *name);

extern int cap_inode_setxattr(struct dentry *dentry, const char *name,

			      const void *value, size_t size, int flags);

extern int cap_inode_removexattr(struct dentry *dentry, const char *name);

extern int cap_inode_need_killpriv(struct dentry *dentry);

extern int cap_inode_killpriv(struct dentry *dentry);

extern int cap_task_post_setuid(uid_t old_ruid, uid_t old_euid, uid_t old_suid, int flags);
@@ -1362,13 +1363,13 @@ struct security_operations { 
	int (*inode_setattr)	(struct dentry *dentry, struct iattr *attr);

	int (*inode_getattr) (struct vfsmount *mnt, struct dentry *dentry);

	void (*inode_delete) (struct inode *inode);

	int (*inode_setxattr) (struct dentry *dentry, char *name, void *value,

			       size_t size, int flags);

	void (*inode_post_setxattr) (struct dentry *dentry, char *name, void *value,

				     size_t size, int flags);

	int (*inode_getxattr) (struct dentry *dentry, char *name);

	int (*inode_setxattr) (struct dentry *dentry, const char *name,

			       const void *value, size_t size, int flags);

	void (*inode_post_setxattr) (struct dentry *dentry, const char *name,

				     const void *value, size_t size, int flags);

	int (*inode_getxattr) (struct dentry *dentry, const char *name);

	int (*inode_listxattr) (struct dentry *dentry);

	int (*inode_removexattr) (struct dentry *dentry, char *name);

	int (*inode_removexattr) (struct dentry *dentry, const char *name);

	int (*inode_need_killpriv) (struct dentry *dentry);

	int (*inode_killpriv) (struct dentry *dentry);

	int (*inode_getsecurity) (const struct inode *inode, const char *name, void **buffer, bool alloc);
@@ -1633,13 +1634,13 @@ int security_inode_permission(struct inode *inode, int mask, struct nameidata *n 
int security_inode_setattr(struct dentry *dentry, struct iattr *attr);

int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry);

void security_inode_delete(struct inode *inode);

int security_inode_setxattr(struct dentry *dentry, char *name,

			    void *value, size_t size, int flags);

void security_inode_post_setxattr(struct dentry *dentry, char *name,

				  void *value, size_t size, int flags);

int security_inode_getxattr(struct dentry *dentry, char *name);

int security_inode_setxattr(struct dentry *dentry, const char *name,

			    const 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);

int security_inode_getxattr(struct dentry *dentry, const char *name);

int security_inode_listxattr(struct dentry *dentry);

int security_inode_removexattr(struct dentry *dentry, char *name);

int security_inode_removexattr(struct dentry *dentry, const char *name);

int security_inode_need_killpriv(struct dentry *dentry);

int security_inode_killpriv(struct dentry *dentry);

int security_inode_getsecurity(const struct inode *inode, const char *name, void **buffer, bool alloc);
@@ -2041,17 +2042,18 @@ static inline int security_inode_getattr(struct vfsmount *mnt, 
static inline void security_inode_delete(struct inode *inode)

{ }



static inline int security_inode_setxattr(struct dentry *dentry, char *name,

					   void *value, size_t size, int flags)

static inline int security_inode_setxattr(struct dentry *dentry,

		const char *name, const void *value, size_t size, int flags)

{

	return cap_inode_setxattr(dentry, name, value, size, flags);

}



static inline void security_inode_post_setxattr(struct dentry *dentry, char *name,

						 void *value, size_t size, int flags)

static inline void security_inode_post_setxattr(struct dentry *dentry,

		const char *name, const void *value, size_t size, int flags)

{ }



static inline int security_inode_getxattr(struct dentry *dentry, char *name)

static inline int security_inode_getxattr(struct dentry *dentry,

			const char *name)

{

	return 0;

}
@@ -2061,7 +2063,8 @@ static inline int security_inode_listxattr(struct dentry *dentry) 
	return 0;

}



static inline int security_inode_removexattr(struct dentry *dentry, char *name)

static inline int security_inode_removexattr(struct dentry *dentry,

			const char *name)

{

	return cap_inode_removexattr(dentry, name);

}

include/linux/syscalls.h

+16 −14
Original line number Diff line number Diff line
@@ -240,26 +240,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -383,8 +383,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))
@@ -397,7 +397,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))