Commit 2835a13b authored by John Johansen's avatar John Johansen
Browse files

apparmor: cleanup rename XXX_file_context() to XXX_file_ctx() 



Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent df8073c6

security/apparmor/include/file.h

+12 −5
Original line number Original line Diff line number Diff line
@@ -30,6 +30,8 @@ struct path; 
				 AA_MAY_CHMOD | AA_MAY_CHOWN | AA_MAY_LOCK | \

				 AA_MAY_CHMOD | AA_MAY_CHOWN | AA_MAY_LOCK | \

				 AA_EXEC_MMAP | AA_MAY_LINK)

				 AA_EXEC_MMAP | AA_MAY_LINK)





#define file_ctx(X) ((struct aa_file_ctx *)(X)->f_security)



/* struct aa_file_ctx - the AppArmor context the file was opened in

/* struct aa_file_ctx - the AppArmor context the file was opened in

 * @perms: the permission the file was opened with

 * @perms: the permission the file was opened with

 *

 *
@@ -42,21 +44,26 @@ struct aa_file_ctx { 
};

};





/**

/**

 * aa_alloc_file_context - allocate file_ctx

 * aa_alloc_file_ctx - allocate file_ctx

 * @label: initial label of task creating the file

 * @gfp: gfp flags for allocation

 * @gfp: gfp flags for allocation

 *

 *

 * Returns: file_ctx or NULL on failure

 * Returns: file_ctx or NULL on failure

 */

 */

static inline struct aa_file_ctx *aa_alloc_file_context(gfp_t gfp)

static inline struct aa_file_ctx *aa_alloc_file_ctx(gfp_t gfp)

{

{

	return kzalloc(sizeof(struct aa_file_ctx), gfp);

	struct aa_file_ctx *ctx;



	ctx = kzalloc(sizeof(struct aa_file_ctx), gfp);



	return ctx;

}

}





/**

/**

 * aa_free_file_context - free a file_ctx

 * aa_free_file_ctx - free a file_ctx

 * @ctx: file_ctx to free  (MAYBE_NULL)

 * @ctx: file_ctx to free  (MAYBE_NULL)

 */

 */

static inline void aa_free_file_context(struct aa_file_ctx *ctx)

static inline void aa_free_file_ctx(struct aa_file_ctx *ctx)

{

{

	if (ctx)

	if (ctx)

		kzfree(ctx);

		kzfree(ctx);

security/apparmor/lsm.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -398,9 +398,9 @@ static int apparmor_file_alloc_security(struct file *file) 




	/* freed by apparmor_file_free_security */

	/* freed by apparmor_file_free_security */

	struct aa_profile *profile = begin_current_profile_crit_section();

	struct aa_profile *profile = begin_current_profile_crit_section();

	file->f_security = aa_alloc_file_context(GFP_KERNEL);

	file->f_security = aa_alloc_file_ctx(GFP_KERNEL);

	if (!file->f_security)

	if (!file_ctx(file))

		return -ENOMEM;

		error = -ENOMEM;

	end_current_profile_crit_section(profile);

	end_current_profile_crit_section(profile);





	return error;

	return error;
@@ -408,9 +408,7 @@ static int apparmor_file_alloc_security(struct file *file) 




static void apparmor_file_free_security(struct file *file)

static void apparmor_file_free_security(struct file *file)

{

{

	struct aa_file_ctx *ctx = file->f_security;

	aa_free_file_ctx(file_ctx(file));



	aa_free_file_context(ctx);

}

}





static int common_file_perm(const char *op, struct file *file, u32 mask)

static int common_file_perm(const char *op, struct file *file, u32 mask)