Skip to content

Commit

Permalink
Merge branch 'fprobe: Fixes for Sparse and Smatch warnings'
Browse files Browse the repository at this point in the history
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: Alexei Starovoitov <[email protected]>
  • Loading branch information
Alexei Starovoitov committed Mar 29, 2022
2 parents 8c1b211 + 261608f commit 76db178
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions kernel/trace/fprobe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 76db178

Please sign in to comment.