Commit 254c8b96 authored by Roni Nevalainen's avatar Roni Nevalainen Committed by Paul Moore
Browse files

audit: add blank line after variable declarations 



Fix the following checkpatch warning in auditsc.c:

WARNING: Missing a blank line after declarations

Signed-off-by: default avatarRoni Nevalainen <kitten@kittenz.dev>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 6efb943b

kernel/auditsc.c

+21 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = { 
static int audit_match_perm(struct audit_context *ctx, int mask)

{

	unsigned n;



	if (unlikely(!ctx))

		return 0;

	n = ctx->major;
@@ -239,6 +240,7 @@ static int put_tree_ref(struct audit_context *ctx, struct audit_chunk *chunk) 
{

	struct audit_tree_refs *p = ctx->trees;

	int left = ctx->tree_count;



	if (likely(left)) {

		p->c[--left] = chunk;

		ctx->tree_count = left;
@@ -259,6 +261,7 @@ static int put_tree_ref(struct audit_context *ctx, struct audit_chunk *chunk) 
static int grow_tree_refs(struct audit_context *ctx)

{

	struct audit_tree_refs *p = ctx->trees;



	ctx->trees = kzalloc(sizeof(struct audit_tree_refs), GFP_KERNEL);

	if (!ctx->trees) {

		ctx->trees = p;
@@ -277,6 +280,7 @@ static void unroll_tree_refs(struct audit_context *ctx, 
{

	struct audit_tree_refs *q;

	int n;



	if (!p) {

		/* we started with empty chain */

		p = ctx->first_trees;
@@ -303,6 +307,7 @@ static void unroll_tree_refs(struct audit_context *ctx, 
static void free_tree_refs(struct audit_context *ctx)

{

	struct audit_tree_refs *p, *q;



	for (p = ctx->first_trees; p; p = q) {

		q = p->next;

		kfree(p);
@@ -313,6 +318,7 @@ static int match_tree_refs(struct audit_context *ctx, struct audit_tree *tree) 
{

	struct audit_tree_refs *p;

	int n;



	if (!tree)

		return 0;

	/* full ones */
@@ -1225,6 +1231,7 @@ static void show_special(struct audit_context *context, int *call_panic) 
	switch (context->type) {

	case AUDIT_SOCKETCALL: {

		int nargs = context->socketcall.nargs;



		audit_log_format(ab, "nargs=%d", nargs);

		for (i = 0; i < nargs; i++)

			audit_log_format(ab, " a%d=%lx", i,
@@ -1240,6 +1247,7 @@ static void show_special(struct audit_context *context, int *call_panic) 
		if (osid) {

			char *ctx = NULL;

			u32 len;



			if (security_secid_to_secctx(osid, &ctx, &len)) {

				audit_log_format(ab, " osid=%u", osid);

				*call_panic = 1;
@@ -1289,6 +1297,7 @@ static void show_special(struct audit_context *context, int *call_panic) 
		break;

	case AUDIT_MQ_GETSETATTR: {

		struct mq_attr *attr = &context->mq_getsetattr.mqstat;



		audit_log_format(ab,

			"mqdes=%d mq_flags=0x%lx mq_maxmsg=%ld mq_msgsize=%ld "

			"mq_curmsgs=%ld ",
@@ -1325,6 +1334,7 @@ static void show_special(struct audit_context *context, int *call_panic) 
static inline int audit_proctitle_rtrim(char *proctitle, int len)

{

	char *end = proctitle + len - 1;



	while (end > proctitle && !isprint(*end))

		end--;
@@ -1513,6 +1523,7 @@ static void audit_log_exit(void) 


		case AUDIT_BPRM_FCAPS: {

			struct audit_aux_data_bprm_fcaps *axs = (void *)aux;



			audit_log_format(ab, "fver=%x", axs->fcap_ver);

			audit_log_cap(ab, "fp", &axs->fcap.permitted);

			audit_log_cap(ab, "fi", &axs->fcap.inheritable);
@@ -1765,6 +1776,7 @@ static inline void handle_one(const struct inode *inode) 
	struct audit_tree_refs *p;

	struct audit_chunk *chunk;

	int count;



	if (likely(!inode->i_fsnotify_marks))

		return;

	context = audit_context();
@@ -1806,8 +1818,10 @@ static void handle_path(const struct dentry *dentry) 
	seq = read_seqbegin(&rename_lock);

	for(;;) {

		struct inode *inode = d_backing_inode(d);



		if (inode && unlikely(inode->i_fsnotify_marks)) {

			struct audit_chunk *chunk;



			chunk = audit_tree_lookup(inode);

			if (chunk) {

				if (unlikely(!put_tree_ref(context, chunk))) {
@@ -2285,6 +2299,7 @@ void __audit_mq_notify(mqd_t mqdes, const struct sigevent *notification) 
void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)

{

	struct audit_context *context = audit_context();



	context->mq_getsetattr.mqdes = mqdes;

	context->mq_getsetattr.mqstat = *mqstat;

	context->type = AUDIT_MQ_GETSETATTR;
@@ -2298,6 +2313,7 @@ void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat) 
void __audit_ipc_obj(struct kern_ipc_perm *ipcp)

{

	struct audit_context *context = audit_context();



	context->ipc.uid = ipcp->uid;

	context->ipc.gid = ipcp->gid;

	context->ipc.mode = ipcp->mode;
@@ -2362,6 +2378,7 @@ int __audit_socketcall(int nargs, unsigned long *args) 
void __audit_fd_pair(int fd1, int fd2)

{

	struct audit_context *context = audit_context();



	context->fds[0] = fd1;

	context->fds[1] = fd2;

}
@@ -2379,6 +2396,7 @@ int __audit_sockaddr(int len, void *a) 


	if (!context->sockaddr) {

		void *p = kmalloc(sizeof(struct sockaddr_storage), GFP_KERNEL);



		if (!p)

			return -ENOMEM;

		context->sockaddr = p;
@@ -2510,6 +2528,7 @@ int __audit_log_bprm_fcaps(struct linux_binprm *bprm, 
void __audit_log_capset(const struct cred *new, const struct cred *old)

{

	struct audit_context *context = audit_context();



	context->capset.pid = task_tgid_nr(current);

	context->capset.cap.effective   = new->cap_effective;

	context->capset.cap.inheritable = new->cap_effective;
@@ -2521,6 +2540,7 @@ void __audit_log_capset(const struct cred *new, const struct cred *old) 
void __audit_mmap_fd(int fd, int flags)

{

	struct audit_context *context = audit_context();



	context->mmap.fd = fd;

	context->mmap.flags = flags;

	context->type = AUDIT_MMAP;
@@ -2686,6 +2706,7 @@ void audit_seccomp_actions_logged(const char *names, const char *old_names, 
struct list_head *audit_killed_trees(void)

{

	struct audit_context *ctx = audit_context();



	if (likely(!ctx || !ctx->in_syscall))

		return NULL;

	return &ctx->killed_trees;