aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-05 18:03:59 -0500
committerJames Morris <jmorris@namei.org>2008-04-18 06:26:07 -0400
commitdd6f953adb5c4deb9cd7b6a5054e7d5eafe4ed71 (patch)
tree0ed459ca8da43b7e0486c8f0a840845a731920bf /security
parentb0c636b99997c8594da6a46e166ce4fcf6956fda (diff)
security: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: James Morris <jmorris@namei.org> Cc: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/commoncap.c4
-rw-r--r--security/keys/internal.h8
-rw-r--r--security/root_plug.c2
-rw-r--r--security/security.c8
-rw-r--r--security/selinux/hooks.c16
-rw-r--r--security/selinux/netlink.c2
-rw-r--r--security/selinux/selinuxfs.c8
-rw-r--r--security/selinux/ss/services.c4
8 files changed, 26 insertions, 26 deletions
diff --git a/security/commoncap.c b/security/commoncap.c
index 06d5c9469ba3..852905789caf 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -267,7 +267,7 @@ static int get_file_caps(struct linux_binprm *bprm)
267 rc = cap_from_disk(&vcaps, bprm, rc); 267 rc = cap_from_disk(&vcaps, bprm, rc);
268 if (rc) 268 if (rc)
269 printk(KERN_NOTICE "%s: cap_from_disk returned %d for %s\n", 269 printk(KERN_NOTICE "%s: cap_from_disk returned %d for %s\n",
270 __FUNCTION__, rc, bprm->filename); 270 __func__, rc, bprm->filename);
271 271
272out: 272out:
273 dput(dentry); 273 dput(dentry);
@@ -302,7 +302,7 @@ int cap_bprm_set_security (struct linux_binprm *bprm)
302 ret = get_file_caps(bprm); 302 ret = get_file_caps(bprm);
303 if (ret) 303 if (ret)
304 printk(KERN_NOTICE "%s: get_file_caps returned %d for %s\n", 304 printk(KERN_NOTICE "%s: get_file_caps returned %d for %s\n",
305 __FUNCTION__, ret, bprm->filename); 305 __func__, ret, bprm->filename);
306 306
307 /* To support inheritance of root-permissions and suid-root 307 /* To support inheritance of root-permissions and suid-root
308 * executables under compatibility mode, we raise all three 308 * executables under compatibility mode, we raise all three
diff --git a/security/keys/internal.h b/security/keys/internal.h
index d36d69393356..7d894ef70370 100644
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -22,16 +22,16 @@ void no_printk(const char *fmt, ...)
22 22
23#ifdef __KDEBUG 23#ifdef __KDEBUG
24#define kenter(FMT, ...) \ 24#define kenter(FMT, ...) \
25 printk(KERN_DEBUG "==> %s("FMT")\n", __FUNCTION__, ##__VA_ARGS__) 25 printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__)
26#define kleave(FMT, ...) \ 26#define kleave(FMT, ...) \
27 printk(KERN_DEBUG "<== %s()"FMT"\n", __FUNCTION__, ##__VA_ARGS__) 27 printk(KERN_DEBUG "<== %s()"FMT"\n", __func__, ##__VA_ARGS__)
28#define kdebug(FMT, ...) \ 28#define kdebug(FMT, ...) \
29 printk(KERN_DEBUG "xxx" FMT"yyy\n", ##__VA_ARGS__) 29 printk(KERN_DEBUG "xxx" FMT"yyy\n", ##__VA_ARGS__)
30#else 30#else
31#define kenter(FMT, ...) \ 31#define kenter(FMT, ...) \
32 no_printk(KERN_DEBUG "==> %s("FMT")\n", __FUNCTION__, ##__VA_ARGS__) 32 no_printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__)
33#define kleave(FMT, ...) \ 33#define kleave(FMT, ...) \
34 no_printk(KERN_DEBUG "<== %s()"FMT"\n", __FUNCTION__, ##__VA_ARGS__) 34 no_printk(KERN_DEBUG "<== %s()"FMT"\n", __func__, ##__VA_ARGS__)
35#define kdebug(FMT, ...) \ 35#define kdebug(FMT, ...) \
36 no_printk(KERN_DEBUG FMT"\n", ##__VA_ARGS__) 36 no_printk(KERN_DEBUG FMT"\n", ##__VA_ARGS__)
37#endif 37#endif
diff --git a/security/root_plug.c b/security/root_plug.c
index 870f13095bb6..6112d1404c81 100644
--- a/security/root_plug.c
+++ b/security/root_plug.c
@@ -49,7 +49,7 @@ module_param(debug, bool, 0600);
49 do { \ 49 do { \
50 if (debug) \ 50 if (debug) \
51 printk(KERN_DEBUG "%s: %s: " fmt , \ 51 printk(KERN_DEBUG "%s: %s: " fmt , \
52 MY_NAME , __FUNCTION__ , \ 52 MY_NAME , __func__ , \
53 ## arg); \ 53 ## arg); \
54 } while (0) 54 } while (0)
55 55
diff --git a/security/security.c b/security/security.c
index b1387a6b416d..9beecac933b4 100644
--- a/security/security.c
+++ b/security/security.c
@@ -57,7 +57,7 @@ int __init security_init(void)
57 57
58 if (verify(&dummy_security_ops)) { 58 if (verify(&dummy_security_ops)) {
59 printk(KERN_ERR "%s could not verify " 59 printk(KERN_ERR "%s could not verify "
60 "dummy_security_ops structure.\n", __FUNCTION__); 60 "dummy_security_ops structure.\n", __func__);
61 return -EIO; 61 return -EIO;
62 } 62 }
63 63
@@ -82,7 +82,7 @@ int register_security(struct security_operations *ops)
82{ 82{
83 if (verify(ops)) { 83 if (verify(ops)) {
84 printk(KERN_DEBUG "%s could not verify " 84 printk(KERN_DEBUG "%s could not verify "
85 "security_operations structure.\n", __FUNCTION__); 85 "security_operations structure.\n", __func__);
86 return -EINVAL; 86 return -EINVAL;
87 } 87 }
88 88
@@ -110,13 +110,13 @@ int mod_reg_security(const char *name, struct security_operations *ops)
110{ 110{
111 if (verify(ops)) { 111 if (verify(ops)) {
112 printk(KERN_INFO "%s could not verify " 112 printk(KERN_INFO "%s could not verify "
113 "security operations.\n", __FUNCTION__); 113 "security operations.\n", __func__);
114 return -EINVAL; 114 return -EINVAL;
115 } 115 }
116 116
117 if (ops == security_ops) { 117 if (ops == security_ops) {
118 printk(KERN_INFO "%s security operations " 118 printk(KERN_INFO "%s security operations "
119 "already registered.\n", __FUNCTION__); 119 "already registered.\n", __func__);
120 return -EINVAL; 120 return -EINVAL;
121 } 121 }
122 122
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index d569cde440e6..74bb74b4db08 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -668,7 +668,7 @@ static int selinux_set_mnt_opts(struct super_block *sb,
668 rc = security_fs_use(sb->s_type->name, &sbsec->behavior, &sbsec->sid); 668 rc = security_fs_use(sb->s_type->name, &sbsec->behavior, &sbsec->sid);
669 if (rc) { 669 if (rc) {
670 printk(KERN_WARNING "%s: security_fs_use(%s) returned %d\n", 670 printk(KERN_WARNING "%s: security_fs_use(%s) returned %d\n",
671 __FUNCTION__, sb->s_type->name, rc); 671 __func__, sb->s_type->name, rc);
672 goto out; 672 goto out;
673 } 673 }
674 674
@@ -1134,7 +1134,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
1134 } 1134 }
1135 if (!dentry) { 1135 if (!dentry) {
1136 printk(KERN_WARNING "%s: no dentry for dev=%s " 1136 printk(KERN_WARNING "%s: no dentry for dev=%s "
1137 "ino=%ld\n", __FUNCTION__, inode->i_sb->s_id, 1137 "ino=%ld\n", __func__, inode->i_sb->s_id,
1138 inode->i_ino); 1138 inode->i_ino);
1139 goto out_unlock; 1139 goto out_unlock;
1140 } 1140 }
@@ -1172,7 +1172,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
1172 if (rc < 0) { 1172 if (rc < 0) {
1173 if (rc != -ENODATA) { 1173 if (rc != -ENODATA) {
1174 printk(KERN_WARNING "%s: getxattr returned " 1174 printk(KERN_WARNING "%s: getxattr returned "
1175 "%d for dev=%s ino=%ld\n", __FUNCTION__, 1175 "%d for dev=%s ino=%ld\n", __func__,
1176 -rc, inode->i_sb->s_id, inode->i_ino); 1176 -rc, inode->i_sb->s_id, inode->i_ino);
1177 kfree(context); 1177 kfree(context);
1178 goto out_unlock; 1178 goto out_unlock;
@@ -1187,7 +1187,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
1187 if (rc) { 1187 if (rc) {
1188 printk(KERN_WARNING "%s: context_to_sid(%s) " 1188 printk(KERN_WARNING "%s: context_to_sid(%s) "
1189 "returned %d for dev=%s ino=%ld\n", 1189 "returned %d for dev=%s ino=%ld\n",
1190 __FUNCTION__, context, -rc, 1190 __func__, context, -rc,
1191 inode->i_sb->s_id, inode->i_ino); 1191 inode->i_sb->s_id, inode->i_ino);
1192 kfree(context); 1192 kfree(context);
1193 /* Leave with the unlabeled SID */ 1193 /* Leave with the unlabeled SID */
@@ -2437,7 +2437,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir,
2437 printk(KERN_WARNING "%s: " 2437 printk(KERN_WARNING "%s: "
2438 "security_transition_sid failed, rc=%d (dev=%s " 2438 "security_transition_sid failed, rc=%d (dev=%s "
2439 "ino=%ld)\n", 2439 "ino=%ld)\n",
2440 __FUNCTION__, 2440 __func__,
2441 -rc, inode->i_sb->s_id, inode->i_ino); 2441 -rc, inode->i_sb->s_id, inode->i_ino);
2442 return rc; 2442 return rc;
2443 } 2443 }
@@ -2671,7 +2671,7 @@ static void selinux_inode_post_setxattr(struct dentry *dentry, char *name,
2671 rc = security_context_to_sid(value, size, &newsid); 2671 rc = security_context_to_sid(value, size, &newsid);
2672 if (rc) { 2672 if (rc) {
2673 printk(KERN_WARNING "%s: unable to obtain SID for context " 2673 printk(KERN_WARNING "%s: unable to obtain SID for context "
2674 "%s, rc=%d\n", __FUNCTION__, (char*)value, -rc); 2674 "%s, rc=%d\n", __func__, (char*)value, -rc);
2675 return; 2675 return;
2676 } 2676 }
2677 2677
@@ -5017,14 +5017,14 @@ static int selinux_register_security (const char *name, struct security_operatio
5017{ 5017{
5018 if (secondary_ops != original_ops) { 5018 if (secondary_ops != original_ops) {
5019 printk(KERN_ERR "%s: There is already a secondary security " 5019 printk(KERN_ERR "%s: There is already a secondary security "
5020 "module registered.\n", __FUNCTION__); 5020 "module registered.\n", __func__);
5021 return -EINVAL; 5021 return -EINVAL;
5022 } 5022 }
5023 5023
5024 secondary_ops = ops; 5024 secondary_ops = ops;
5025 5025
5026 printk(KERN_INFO "%s: Registering secondary module %s\n", 5026 printk(KERN_INFO "%s: Registering secondary module %s\n",
5027 __FUNCTION__, 5027 __func__,
5028 name); 5028 name);
5029 5029
5030 return 0; 5030 return 0;
diff --git a/security/selinux/netlink.c b/security/selinux/netlink.c
index b59871d74dad..6214a7a73149 100644
--- a/security/selinux/netlink.c
+++ b/security/selinux/netlink.c
@@ -89,7 +89,7 @@ out:
89nlmsg_failure: 89nlmsg_failure:
90 kfree_skb(skb); 90 kfree_skb(skb);
91oom: 91oom:
92 printk(KERN_ERR "SELinux: OOM in %s\n", __FUNCTION__); 92 printk(KERN_ERR "SELinux: OOM in %s\n", __func__);
93 goto out; 93 goto out;
94} 94}
95 95
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 1d996bb953b8..26fabad09769 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -392,7 +392,7 @@ static ssize_t sel_write_context(struct file * file, char *buf, size_t size)
392 392
393 if (len > SIMPLE_TRANSACTION_LIMIT) { 393 if (len > SIMPLE_TRANSACTION_LIMIT) {
394 printk(KERN_ERR "%s: context size (%u) exceeds payload " 394 printk(KERN_ERR "%s: context size (%u) exceeds payload "
395 "max\n", __FUNCTION__, len); 395 "max\n", __func__, len);
396 length = -ERANGE; 396 length = -ERANGE;
397 goto out; 397 goto out;
398 } 398 }
@@ -645,7 +645,7 @@ static ssize_t sel_write_create(struct file * file, char *buf, size_t size)
645 645
646 if (len > SIMPLE_TRANSACTION_LIMIT) { 646 if (len > SIMPLE_TRANSACTION_LIMIT) {
647 printk(KERN_ERR "%s: context size (%u) exceeds payload " 647 printk(KERN_ERR "%s: context size (%u) exceeds payload "
648 "max\n", __FUNCTION__, len); 648 "max\n", __func__, len);
649 length = -ERANGE; 649 length = -ERANGE;
650 goto out3; 650 goto out3;
651 } 651 }
@@ -822,7 +822,7 @@ static ssize_t sel_write_member(struct file * file, char *buf, size_t size)
822 822
823 if (len > SIMPLE_TRANSACTION_LIMIT) { 823 if (len > SIMPLE_TRANSACTION_LIMIT) {
824 printk(KERN_ERR "%s: context size (%u) exceeds payload " 824 printk(KERN_ERR "%s: context size (%u) exceeds payload "
825 "max\n", __FUNCTION__, len); 825 "max\n", __func__, len);
826 length = -ERANGE; 826 length = -ERANGE;
827 goto out3; 827 goto out3;
828 } 828 }
@@ -1761,7 +1761,7 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
1761out: 1761out:
1762 return ret; 1762 return ret;
1763err: 1763err:
1764 printk(KERN_ERR "%s: failed while creating inodes\n", __FUNCTION__); 1764 printk(KERN_ERR "%s: failed while creating inodes\n", __func__);
1765 goto out; 1765 goto out;
1766} 1766}
1767 1767
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 4a14348de876..face5795c760 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -413,7 +413,7 @@ static int context_struct_compute_av(struct context *scontext,
413 return 0; 413 return 0;
414 414
415inval_class: 415inval_class:
416 printk(KERN_ERR "%s: unrecognized class %d\n", __FUNCTION__, tclass); 416 printk(KERN_ERR "%s: unrecognized class %d\n", __func__, tclass);
417 return -EINVAL; 417 return -EINVAL;
418} 418}
419 419
@@ -2206,7 +2206,7 @@ int security_get_permissions(char *class, char ***perms, int *nperms)
2206 match = hashtab_search(policydb.p_classes.table, class); 2206 match = hashtab_search(policydb.p_classes.table, class);
2207 if (!match) { 2207 if (!match) {
2208 printk(KERN_ERR "%s: unrecognized class %s\n", 2208 printk(KERN_ERR "%s: unrecognized class %s\n",
2209 __FUNCTION__, class); 2209 __func__, class);
2210 rc = -EINVAL; 2210 rc = -EINVAL;
2211 goto out; 2211 goto out;
2212 } 2212 }