Commit 76db1784 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'fprobe: Fixes for Sparse and Smatch warnings' 



Masami Hiramatsu says:

====================

Hi,

These fprobe patches are for fixing the warnings by Smatch and sparse.
This is arch independent part of the fixes.

Thank you,
---
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 8c1b2119 261608f3

kernel/trace/fprobe.c

+4 −4
Original line number Diff line number Diff line
@@ -150,15 +150,15 @@ static int fprobe_init_rethook(struct fprobe *fp, int num) 


	fp->rethook = rethook_alloc((void *)fp, fprobe_exit_handler);

	for (i = 0; i < size; i++) {

		struct rethook_node *node;

		struct fprobe_rethook_node *node;



		node = kzalloc(sizeof(struct fprobe_rethook_node), GFP_KERNEL);

		node = kzalloc(sizeof(*node), GFP_KERNEL);

		if (!node) {

			rethook_free(fp->rethook);

			fp->rethook = NULL;

			return -ENOMEM;

		}

		rethook_add_node(fp->rethook, node);

		rethook_add_node(fp->rethook, &node->node);

	}

	return 0;

}
@@ -215,7 +215,7 @@ int register_fprobe(struct fprobe *fp, const char *filter, const char *notfilter 
	 * correctly calculate the total number of filtered symbols

	 * from both filter and notfilter.

	 */

	hash = fp->ops.local_hash.filter_hash;

	hash = rcu_access_pointer(fp->ops.local_hash.filter_hash);

	if (WARN_ON_ONCE(!hash))

		goto out;