tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

xattr: add missing consts to function arguments

Add missing consts to xattr function arguments.

Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

David Howells and committed by
Linus Torvalds 8f0cfa52 7ec02ef1

+96 -87
+21 -20
fs/xattr.c
··· 67 67 } 68 68 69 69 int 70 - vfs_setxattr(struct dentry *dentry, char *name, void *value, 70 + vfs_setxattr(struct dentry *dentry, const char *name, const void *value, 71 71 size_t size, int flags) 72 72 { 73 73 struct inode *inode = dentry->d_inode; ··· 131 131 EXPORT_SYMBOL_GPL(xattr_getsecurity); 132 132 133 133 ssize_t 134 - vfs_getxattr(struct dentry *dentry, char *name, void *value, size_t size) 134 + vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size) 135 135 { 136 136 struct inode *inode = dentry->d_inode; 137 137 int error; ··· 187 187 EXPORT_SYMBOL_GPL(vfs_listxattr); 188 188 189 189 int 190 - vfs_removexattr(struct dentry *dentry, char *name) 190 + vfs_removexattr(struct dentry *dentry, const char *name) 191 191 { 192 192 struct inode *inode = dentry->d_inode; 193 193 int error; ··· 218 218 * Extended attribute SET operations 219 219 */ 220 220 static long 221 - setxattr(struct dentry *d, char __user *name, void __user *value, 221 + setxattr(struct dentry *d, const char __user *name, const void __user *value, 222 222 size_t size, int flags) 223 223 { 224 224 int error; ··· 252 252 } 253 253 254 254 asmlinkage long 255 - sys_setxattr(char __user *path, char __user *name, void __user *value, 256 - size_t size, int flags) 255 + sys_setxattr(const char __user *path, const char __user *name, 256 + const void __user *value, size_t size, int flags) 257 257 { 258 258 struct nameidata nd; 259 259 int error; ··· 271 271 } 272 272 273 273 asmlinkage long 274 - sys_lsetxattr(char __user *path, char __user *name, void __user *value, 275 - size_t size, int flags) 274 + sys_lsetxattr(const char __user *path, const char __user *name, 275 + const void __user *value, size_t size, int flags) 276 276 { 277 277 struct nameidata nd; 278 278 int error; ··· 290 290 } 291 291 292 292 asmlinkage long 293 - sys_fsetxattr(int fd, char __user *name, void __user *value, 293 + sys_fsetxattr(int fd, const char __user *name, const void __user *value, 294 294 size_t size, int flags) 295 295 { 296 296 struct file *f; ··· 315 315 * Extended attribute GET operations 316 316 */ 317 317 static ssize_t 318 - getxattr(struct dentry *d, char __user *name, void __user *value, size_t size) 318 + getxattr(struct dentry *d, const char __user *name, void __user *value, 319 + size_t size) 319 320 { 320 321 ssize_t error; 321 322 void *kvalue = NULL; ··· 350 349 } 351 350 352 351 asmlinkage ssize_t 353 - sys_getxattr(char __user *path, char __user *name, void __user *value, 354 - size_t size) 352 + sys_getxattr(const char __user *path, const char __user *name, 353 + void __user *value, size_t size) 355 354 { 356 355 struct nameidata nd; 357 356 ssize_t error; ··· 365 364 } 366 365 367 366 asmlinkage ssize_t 368 - sys_lgetxattr(char __user *path, char __user *name, void __user *value, 367 + sys_lgetxattr(const char __user *path, const char __user *name, void __user *value, 369 368 size_t size) 370 369 { 371 370 struct nameidata nd; ··· 380 379 } 381 380 382 381 asmlinkage ssize_t 383 - sys_fgetxattr(int fd, char __user *name, void __user *value, size_t size) 382 + sys_fgetxattr(int fd, const char __user *name, void __user *value, size_t size) 384 383 { 385 384 struct file *f; 386 385 ssize_t error = -EBADF; ··· 425 424 } 426 425 427 426 asmlinkage ssize_t 428 - sys_listxattr(char __user *path, char __user *list, size_t size) 427 + sys_listxattr(const char __user *path, char __user *list, size_t size) 429 428 { 430 429 struct nameidata nd; 431 430 ssize_t error; ··· 439 438 } 440 439 441 440 asmlinkage ssize_t 442 - sys_llistxattr(char __user *path, char __user *list, size_t size) 441 + sys_llistxattr(const char __user *path, char __user *list, size_t size) 443 442 { 444 443 struct nameidata nd; 445 444 ssize_t error; ··· 471 470 * Extended attribute REMOVE operations 472 471 */ 473 472 static long 474 - removexattr(struct dentry *d, char __user *name) 473 + removexattr(struct dentry *d, const char __user *name) 475 474 { 476 475 int error; 477 476 char kname[XATTR_NAME_MAX + 1]; ··· 486 485 } 487 486 488 487 asmlinkage long 489 - sys_removexattr(char __user *path, char __user *name) 488 + sys_removexattr(const char __user *path, const char __user *name) 490 489 { 491 490 struct nameidata nd; 492 491 int error; ··· 504 503 } 505 504 506 505 asmlinkage long 507 - sys_lremovexattr(char __user *path, char __user *name) 506 + sys_lremovexattr(const char __user *path, const char __user *name) 508 507 { 509 508 struct nameidata nd; 510 509 int error; ··· 522 521 } 523 522 524 523 asmlinkage long 525 - sys_fremovexattr(int fd, char __user *name) 524 + sys_fremovexattr(int fd, const char __user *name) 526 525 { 527 526 struct file *f; 528 527 struct dentry *dentry;
+23 -20
include/linux/security.h
··· 53 53 extern int cap_bprm_set_security(struct linux_binprm *bprm); 54 54 extern void cap_bprm_apply_creds(struct linux_binprm *bprm, int unsafe); 55 55 extern int cap_bprm_secureexec(struct linux_binprm *bprm); 56 - extern int cap_inode_setxattr(struct dentry *dentry, char *name, void *value, size_t size, int flags); 57 - extern int cap_inode_removexattr(struct dentry *dentry, char *name); 56 + extern int cap_inode_setxattr(struct dentry *dentry, const char *name, 57 + const void *value, size_t size, int flags); 58 + extern int cap_inode_removexattr(struct dentry *dentry, const char *name); 58 59 extern int cap_inode_need_killpriv(struct dentry *dentry); 59 60 extern int cap_inode_killpriv(struct dentry *dentry); 60 61 extern int cap_task_post_setuid(uid_t old_ruid, uid_t old_euid, uid_t old_suid, int flags); ··· 1363 1362 int (*inode_setattr) (struct dentry *dentry, struct iattr *attr); 1364 1363 int (*inode_getattr) (struct vfsmount *mnt, struct dentry *dentry); 1365 1364 void (*inode_delete) (struct inode *inode); 1366 - int (*inode_setxattr) (struct dentry *dentry, char *name, void *value, 1367 - size_t size, int flags); 1368 - void (*inode_post_setxattr) (struct dentry *dentry, char *name, void *value, 1369 - size_t size, int flags); 1370 - int (*inode_getxattr) (struct dentry *dentry, char *name); 1365 + int (*inode_setxattr) (struct dentry *dentry, const char *name, 1366 + const void *value, size_t size, int flags); 1367 + void (*inode_post_setxattr) (struct dentry *dentry, const char *name, 1368 + const void *value, size_t size, int flags); 1369 + int (*inode_getxattr) (struct dentry *dentry, const char *name); 1371 1370 int (*inode_listxattr) (struct dentry *dentry); 1372 - int (*inode_removexattr) (struct dentry *dentry, char *name); 1371 + int (*inode_removexattr) (struct dentry *dentry, const char *name); 1373 1372 int (*inode_need_killpriv) (struct dentry *dentry); 1374 1373 int (*inode_killpriv) (struct dentry *dentry); 1375 1374 int (*inode_getsecurity) (const struct inode *inode, const char *name, void **buffer, bool alloc); ··· 1634 1633 int security_inode_setattr(struct dentry *dentry, struct iattr *attr); 1635 1634 int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry); 1636 1635 void security_inode_delete(struct inode *inode); 1637 - int security_inode_setxattr(struct dentry *dentry, char *name, 1638 - void *value, size_t size, int flags); 1639 - void security_inode_post_setxattr(struct dentry *dentry, char *name, 1640 - void *value, size_t size, int flags); 1641 - int security_inode_getxattr(struct dentry *dentry, char *name); 1636 + int security_inode_setxattr(struct dentry *dentry, const char *name, 1637 + const void *value, size_t size, int flags); 1638 + void security_inode_post_setxattr(struct dentry *dentry, const char *name, 1639 + const void *value, size_t size, int flags); 1640 + int security_inode_getxattr(struct dentry *dentry, const char *name); 1642 1641 int security_inode_listxattr(struct dentry *dentry); 1643 - int security_inode_removexattr(struct dentry *dentry, char *name); 1642 + int security_inode_removexattr(struct dentry *dentry, const char *name); 1644 1643 int security_inode_need_killpriv(struct dentry *dentry); 1645 1644 int security_inode_killpriv(struct dentry *dentry); 1646 1645 int security_inode_getsecurity(const struct inode *inode, const char *name, void **buffer, bool alloc); ··· 2042 2041 static inline void security_inode_delete(struct inode *inode) 2043 2042 { } 2044 2043 2045 - static inline int security_inode_setxattr(struct dentry *dentry, char *name, 2046 - void *value, size_t size, int flags) 2044 + static inline int security_inode_setxattr(struct dentry *dentry, 2045 + const char *name, const void *value, size_t size, int flags) 2047 2046 { 2048 2047 return cap_inode_setxattr(dentry, name, value, size, flags); 2049 2048 } 2050 2049 2051 - static inline void security_inode_post_setxattr(struct dentry *dentry, char *name, 2052 - void *value, size_t size, int flags) 2050 + static inline void security_inode_post_setxattr(struct dentry *dentry, 2051 + const char *name, const void *value, size_t size, int flags) 2053 2052 { } 2054 2053 2055 - static inline int security_inode_getxattr(struct dentry *dentry, char *name) 2054 + static inline int security_inode_getxattr(struct dentry *dentry, 2055 + const char *name) 2056 2056 { 2057 2057 return 0; 2058 2058 } ··· 2063 2061 return 0; 2064 2062 } 2065 2063 2066 - static inline int security_inode_removexattr(struct dentry *dentry, char *name) 2064 + static inline int security_inode_removexattr(struct dentry *dentry, 2065 + const char *name) 2067 2066 { 2068 2067 return cap_inode_removexattr(dentry, name); 2069 2068 }
+16 -14
include/linux/syscalls.h
··· 240 240 asmlinkage long sys_ftruncate64(unsigned int fd, loff_t length); 241 241 #endif 242 242 243 - asmlinkage long sys_setxattr(char __user *path, char __user *name, 244 - void __user *value, size_t size, int flags); 245 - asmlinkage long sys_lsetxattr(char __user *path, char __user *name, 246 - void __user *value, size_t size, int flags); 247 - asmlinkage long sys_fsetxattr(int fd, char __user *name, void __user *value, 248 - size_t size, int flags); 249 - asmlinkage ssize_t sys_getxattr(char __user *path, char __user *name, 243 + asmlinkage long sys_setxattr(const char __user *path, const char __user *name, 244 + const void __user *value, size_t size, int flags); 245 + asmlinkage long sys_lsetxattr(const char __user *path, const char __user *name, 246 + const void __user *value, size_t size, int flags); 247 + asmlinkage long sys_fsetxattr(int fd, const char __user *name, 248 + const void __user *value, size_t size, int flags); 249 + asmlinkage ssize_t sys_getxattr(const char __user *path, const char __user *name, 250 250 void __user *value, size_t size); 251 - asmlinkage ssize_t sys_lgetxattr(char __user *path, char __user *name, 251 + asmlinkage ssize_t sys_lgetxattr(const char __user *path, const char __user *name, 252 252 void __user *value, size_t size); 253 - asmlinkage ssize_t sys_fgetxattr(int fd, char __user *name, 253 + asmlinkage ssize_t sys_fgetxattr(int fd, const char __user *name, 254 254 void __user *value, size_t size); 255 - asmlinkage ssize_t sys_listxattr(char __user *path, char __user *list, 255 + asmlinkage ssize_t sys_listxattr(const char __user *path, char __user *list, 256 256 size_t size); 257 - asmlinkage ssize_t sys_llistxattr(char __user *path, char __user *list, 257 + asmlinkage ssize_t sys_llistxattr(const char __user *path, char __user *list, 258 258 size_t size); 259 259 asmlinkage ssize_t sys_flistxattr(int fd, char __user *list, size_t size); 260 - asmlinkage long sys_removexattr(char __user *path, char __user *name); 261 - asmlinkage long sys_lremovexattr(char __user *path, char __user *name); 262 - asmlinkage long sys_fremovexattr(int fd, char __user *name); 260 + asmlinkage long sys_removexattr(const char __user *path, 261 + const char __user *name); 262 + asmlinkage long sys_lremovexattr(const char __user *path, 263 + const char __user *name); 264 + asmlinkage long sys_fremovexattr(int fd, const char __user *name); 263 265 264 266 asmlinkage unsigned long sys_brk(unsigned long brk); 265 267 asmlinkage long sys_mprotect(unsigned long start, size_t len,
+3 -3
include/linux/xattr.h
··· 47 47 }; 48 48 49 49 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t); 50 - ssize_t vfs_getxattr(struct dentry *, char *, void *, size_t); 50 + ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t); 51 51 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size); 52 - int vfs_setxattr(struct dentry *, char *, void *, size_t, int); 53 - int vfs_removexattr(struct dentry *, char *); 52 + int vfs_setxattr(struct dentry *, const char *, const void *, size_t, int); 53 + int vfs_removexattr(struct dentry *, const char *); 54 54 55 55 ssize_t generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t size); 56 56 ssize_t generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size);
+3 -3
security/commoncap.c
··· 383 383 current->egid != current->gid); 384 384 } 385 385 386 - int cap_inode_setxattr(struct dentry *dentry, char *name, void *value, 387 - size_t size, int flags) 386 + int cap_inode_setxattr(struct dentry *dentry, const char *name, 387 + const void *value, size_t size, int flags) 388 388 { 389 389 if (!strcmp(name, XATTR_NAME_CAPS)) { 390 390 if (!capable(CAP_SETFCAP)) ··· 397 397 return 0; 398 398 } 399 399 400 - int cap_inode_removexattr(struct dentry *dentry, char *name) 400 + int cap_inode_removexattr(struct dentry *dentry, const char *name) 401 401 { 402 402 if (!strcmp(name, XATTR_NAME_CAPS)) { 403 403 if (!capable(CAP_SETFCAP))
+7 -6
security/dummy.c
··· 365 365 return; 366 366 } 367 367 368 - static int dummy_inode_setxattr (struct dentry *dentry, char *name, void *value, 369 - size_t size, int flags) 368 + static int dummy_inode_setxattr (struct dentry *dentry, const char *name, 369 + const void *value, size_t size, int flags) 370 370 { 371 371 if (!strncmp(name, XATTR_SECURITY_PREFIX, 372 372 sizeof(XATTR_SECURITY_PREFIX) - 1) && ··· 375 375 return 0; 376 376 } 377 377 378 - static void dummy_inode_post_setxattr (struct dentry *dentry, char *name, void *value, 379 - size_t size, int flags) 378 + static void dummy_inode_post_setxattr (struct dentry *dentry, const char *name, 379 + const void *value, size_t size, 380 + int flags) 380 381 { 381 382 } 382 383 383 - static int dummy_inode_getxattr (struct dentry *dentry, char *name) 384 + static int dummy_inode_getxattr (struct dentry *dentry, const char *name) 384 385 { 385 386 return 0; 386 387 } ··· 391 390 return 0; 392 391 } 393 392 394 - static int dummy_inode_removexattr (struct dentry *dentry, char *name) 393 + static int dummy_inode_removexattr (struct dentry *dentry, const char *name) 395 394 { 396 395 if (!strncmp(name, XATTR_SECURITY_PREFIX, 397 396 sizeof(XATTR_SECURITY_PREFIX) - 1) &&
+6 -6
security/security.c
··· 491 491 security_ops->inode_delete(inode); 492 492 } 493 493 494 - int security_inode_setxattr(struct dentry *dentry, char *name, 495 - void *value, size_t size, int flags) 494 + int security_inode_setxattr(struct dentry *dentry, const char *name, 495 + const void *value, size_t size, int flags) 496 496 { 497 497 if (unlikely(IS_PRIVATE(dentry->d_inode))) 498 498 return 0; 499 499 return security_ops->inode_setxattr(dentry, name, value, size, flags); 500 500 } 501 501 502 - void security_inode_post_setxattr(struct dentry *dentry, char *name, 503 - void *value, size_t size, int flags) 502 + void security_inode_post_setxattr(struct dentry *dentry, const char *name, 503 + const void *value, size_t size, int flags) 504 504 { 505 505 if (unlikely(IS_PRIVATE(dentry->d_inode))) 506 506 return; 507 507 security_ops->inode_post_setxattr(dentry, name, value, size, flags); 508 508 } 509 509 510 - int security_inode_getxattr(struct dentry *dentry, char *name) 510 + int security_inode_getxattr(struct dentry *dentry, const char *name) 511 511 { 512 512 if (unlikely(IS_PRIVATE(dentry->d_inode))) 513 513 return 0; ··· 521 521 return security_ops->inode_listxattr(dentry); 522 522 } 523 523 524 - int security_inode_removexattr(struct dentry *dentry, char *name) 524 + int security_inode_removexattr(struct dentry *dentry, const char *name) 525 525 { 526 526 if (unlikely(IS_PRIVATE(dentry->d_inode))) 527 527 return 0;
+8 -6
security/selinux/hooks.c
··· 2619 2619 return dentry_has_perm(current, mnt, dentry, FILE__GETATTR); 2620 2620 } 2621 2621 2622 - static int selinux_inode_setotherxattr(struct dentry *dentry, char *name) 2622 + static int selinux_inode_setotherxattr(struct dentry *dentry, const char *name) 2623 2623 { 2624 2624 if (!strncmp(name, XATTR_SECURITY_PREFIX, 2625 2625 sizeof XATTR_SECURITY_PREFIX - 1)) { ··· 2638 2638 return dentry_has_perm(current, NULL, dentry, FILE__SETATTR); 2639 2639 } 2640 2640 2641 - static int selinux_inode_setxattr(struct dentry *dentry, char *name, void *value, size_t size, int flags) 2641 + static int selinux_inode_setxattr(struct dentry *dentry, const char *name, 2642 + const void *value, size_t size, int flags) 2642 2643 { 2643 2644 struct task_security_struct *tsec = current->security; 2644 2645 struct inode *inode = dentry->d_inode; ··· 2688 2687 &ad); 2689 2688 } 2690 2689 2691 - static void selinux_inode_post_setxattr(struct dentry *dentry, char *name, 2692 - void *value, size_t size, int flags) 2690 + static void selinux_inode_post_setxattr(struct dentry *dentry, const char *name, 2691 + const void *value, size_t size, 2692 + int flags) 2693 2693 { 2694 2694 struct inode *inode = dentry->d_inode; 2695 2695 struct inode_security_struct *isec = inode->i_security; ··· 2713 2711 return; 2714 2712 } 2715 2713 2716 - static int selinux_inode_getxattr(struct dentry *dentry, char *name) 2714 + static int selinux_inode_getxattr(struct dentry *dentry, const char *name) 2717 2715 { 2718 2716 return dentry_has_perm(current, NULL, dentry, FILE__GETATTR); 2719 2717 } ··· 2723 2721 return dentry_has_perm(current, NULL, dentry, FILE__GETATTR); 2724 2722 } 2725 2723 2726 - static int selinux_inode_removexattr(struct dentry *dentry, char *name) 2724 + static int selinux_inode_removexattr(struct dentry *dentry, const char *name) 2727 2725 { 2728 2726 if (strcmp(name, XATTR_NAME_SELINUX)) 2729 2727 return selinux_inode_setotherxattr(dentry, name);
+1 -1
security/selinux/include/security.h
··· 93 93 int security_sid_to_context(u32 sid, char **scontext, 94 94 u32 *scontext_len); 95 95 96 - int security_context_to_sid(char *scontext, u32 scontext_len, 96 + int security_context_to_sid(const char *scontext, u32 scontext_len, 97 97 u32 *out_sid); 98 98 99 99 int security_context_to_sid_default(char *scontext, u32 scontext_len,
+2 -2
security/selinux/ss/services.c
··· 708 708 709 709 } 710 710 711 - static int security_context_to_sid_core(char *scontext, u32 scontext_len, 711 + static int security_context_to_sid_core(const char *scontext, u32 scontext_len, 712 712 u32 *sid, u32 def_sid, gfp_t gfp_flags) 713 713 { 714 714 char *scontext2; ··· 835 835 * Returns -%EINVAL if the context is invalid, -%ENOMEM if insufficient 836 836 * memory is available, or 0 on success. 837 837 */ 838 - int security_context_to_sid(char *scontext, u32 scontext_len, u32 *sid) 838 + int security_context_to_sid(const char *scontext, u32 scontext_len, u32 *sid) 839 839 { 840 840 return security_context_to_sid_core(scontext, scontext_len, 841 841 sid, SECSID_NULL, GFP_KERNEL);
+6 -6
security/smack/smack_lsm.c
··· 574 574 * 575 575 * Returns 0 if access is permitted, an error code otherwise 576 576 */ 577 - static int smack_inode_setxattr(struct dentry *dentry, char *name, 578 - void *value, size_t size, int flags) 577 + static int smack_inode_setxattr(struct dentry *dentry, const char *name, 578 + const void *value, size_t size, int flags) 579 579 { 580 580 int rc = 0; 581 581 ··· 604 604 * Set the pointer in the inode blob to the entry found 605 605 * in the master label list. 606 606 */ 607 - static void smack_inode_post_setxattr(struct dentry *dentry, char *name, 608 - void *value, size_t size, int flags) 607 + static void smack_inode_post_setxattr(struct dentry *dentry, const char *name, 608 + const void *value, size_t size, int flags) 609 609 { 610 610 struct inode_smack *isp; 611 611 char *nsp; ··· 641 641 * 642 642 * Returns 0 if access is permitted, an error code otherwise 643 643 */ 644 - static int smack_inode_getxattr(struct dentry *dentry, char *name) 644 + static int smack_inode_getxattr(struct dentry *dentry, const char *name) 645 645 { 646 646 return smk_curacc(smk_of_inode(dentry->d_inode), MAY_READ); 647 647 } ··· 655 655 * 656 656 * Returns 0 if access is permitted, an error code otherwise 657 657 */ 658 - static int smack_inode_removexattr(struct dentry *dentry, char *name) 658 + static int smack_inode_removexattr(struct dentry *dentry, const char *name) 659 659 { 660 660 int rc = 0; 661 661