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

Commit dd6f953a authored by Harvey Harrison's avatar Harvey Harrison Committed by James Morris
Browse files

security: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: James Morris <jmorris@namei.org>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent b0c636b9

security/commoncap.c

+2 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static int get_file_caps(struct linux_binprm *bprm) 
	rc = cap_from_disk(&vcaps, bprm, rc);

	if (rc)

		printk(KERN_NOTICE "%s: cap_from_disk returned %d for %s\n",

			__FUNCTION__, rc, bprm->filename);

			__func__, rc, bprm->filename);



out:

	dput(dentry);
@@ -302,7 +302,7 @@ int cap_bprm_set_security (struct linux_binprm *bprm) 
	ret = get_file_caps(bprm);

	if (ret)

		printk(KERN_NOTICE "%s: get_file_caps returned %d for %s\n",

			__FUNCTION__, ret, bprm->filename);

			__func__, ret, bprm->filename);



	/*  To support inheritance of root-permissions and suid-root

	 *  executables under compatibility mode, we raise all three

security/keys/internal.h

+4 −4
Original line number Diff line number Diff line
@@ -22,16 +22,16 @@ void no_printk(const char *fmt, ...) 


#ifdef __KDEBUG

#define kenter(FMT, ...) \

	printk(KERN_DEBUG "==> %s("FMT")\n", __FUNCTION__, ##__VA_ARGS__)

	printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__)

#define kleave(FMT, ...) \

	printk(KERN_DEBUG "<== %s()"FMT"\n", __FUNCTION__, ##__VA_ARGS__)

	printk(KERN_DEBUG "<== %s()"FMT"\n", __func__, ##__VA_ARGS__)

#define kdebug(FMT, ...) \

	printk(KERN_DEBUG "xxx" FMT"yyy\n", ##__VA_ARGS__)

#else

#define kenter(FMT, ...) \

	no_printk(KERN_DEBUG "==> %s("FMT")\n", __FUNCTION__, ##__VA_ARGS__)

	no_printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__)

#define kleave(FMT, ...) \

	no_printk(KERN_DEBUG "<== %s()"FMT"\n", __FUNCTION__, ##__VA_ARGS__)

	no_printk(KERN_DEBUG "<== %s()"FMT"\n", __func__, ##__VA_ARGS__)

#define kdebug(FMT, ...) \

	no_printk(KERN_DEBUG FMT"\n", ##__VA_ARGS__)

#endif

security/root_plug.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ module_param(debug, bool, 0600); 
	do {							\

		if (debug)					\

			printk(KERN_DEBUG "%s: %s: " fmt ,	\

				MY_NAME , __FUNCTION__ , 	\

				MY_NAME , __func__ , 	\

				## arg);			\

	} while (0)

security/security.c

+4 −4
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ int __init security_init(void) 


	if (verify(&dummy_security_ops)) {

		printk(KERN_ERR "%s could not verify "

		       "dummy_security_ops structure.\n", __FUNCTION__);

		       "dummy_security_ops structure.\n", __func__);

		return -EIO;

	}
@@ -82,7 +82,7 @@ int register_security(struct security_operations *ops) 
{

	if (verify(ops)) {

		printk(KERN_DEBUG "%s could not verify "

		       "security_operations structure.\n", __FUNCTION__);

		       "security_operations structure.\n", __func__);

		return -EINVAL;

	}
@@ -110,13 +110,13 @@ int mod_reg_security(const char *name, struct security_operations *ops) 
{

	if (verify(ops)) {

		printk(KERN_INFO "%s could not verify "

		       "security operations.\n", __FUNCTION__);

		       "security operations.\n", __func__);

		return -EINVAL;

	}



	if (ops == security_ops) {

		printk(KERN_INFO "%s security operations "

		       "already registered.\n", __FUNCTION__);

		       "already registered.\n", __func__);

		return -EINVAL;

	}

security/selinux/hooks.c

+8 −8
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static int selinux_set_mnt_opts(struct super_block *sb, 
	rc = security_fs_use(sb->s_type->name, &sbsec->behavior, &sbsec->sid);

	if (rc) {

		printk(KERN_WARNING "%s: security_fs_use(%s) returned %d\n",

		       __FUNCTION__, sb->s_type->name, rc);

		       __func__, sb->s_type->name, rc);

		goto out;

	}
@@ -1134,7 +1134,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent 
		}

		if (!dentry) {

			printk(KERN_WARNING "%s:  no dentry for dev=%s "

			       "ino=%ld\n", __FUNCTION__, inode->i_sb->s_id,

			       "ino=%ld\n", __func__, inode->i_sb->s_id,

			       inode->i_ino);

			goto out_unlock;

		}
@@ -1172,7 +1172,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent 
		if (rc < 0) {

			if (rc != -ENODATA) {

				printk(KERN_WARNING "%s:  getxattr returned "

				       "%d for dev=%s ino=%ld\n", __FUNCTION__,

				       "%d for dev=%s ino=%ld\n", __func__,

				       -rc, inode->i_sb->s_id, inode->i_ino);

				kfree(context);

				goto out_unlock;
@@ -1187,7 +1187,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent 
			if (rc) {

				printk(KERN_WARNING "%s:  context_to_sid(%s) "

				       "returned %d for dev=%s ino=%ld\n",

				       __FUNCTION__, context, -rc,

				       __func__, context, -rc,

				       inode->i_sb->s_id, inode->i_ino);

				kfree(context);

				/* Leave with the unlabeled SID */
@@ -2437,7 +2437,7 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir, 
			printk(KERN_WARNING "%s:  "

			       "security_transition_sid failed, rc=%d (dev=%s "

			       "ino=%ld)\n",

			       __FUNCTION__,

			       __func__,

			       -rc, inode->i_sb->s_id, inode->i_ino);

			return rc;

		}
@@ -2671,7 +2671,7 @@ static void selinux_inode_post_setxattr(struct dentry *dentry, char *name, 
	rc = security_context_to_sid(value, size, &newsid);

	if (rc) {

		printk(KERN_WARNING "%s:  unable to obtain SID for context "

		       "%s, rc=%d\n", __FUNCTION__, (char*)value, -rc);

		       "%s, rc=%d\n", __func__, (char*)value, -rc);

		return;

	}
@@ -5017,14 +5017,14 @@ static int selinux_register_security (const char *name, struct security_operatio 
{

	if (secondary_ops != original_ops) {

		printk(KERN_ERR "%s:  There is already a secondary security "

		       "module registered.\n", __FUNCTION__);

		       "module registered.\n", __func__);

		return -EINVAL;

 	}



	secondary_ops = ops;



	printk(KERN_INFO "%s:  Registering secondary module %s\n",

	       __FUNCTION__,

	       __func__,

	       name);



	return 0;