projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d71b06a
)
tracing: Don't inc err_log entry count if entry allocation fails
author
Tom Zanussi
<zanussi@kernel.org>
Thu, 27 Jan 2022 21:44:18 +0000
(15:44 -0600)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 1 Feb 2022 16:25:39 +0000
(17:25 +0100)
commit
67ab5eb71b37b55f7c5522d080a1b42823351776
upstream.
tr->n_err_log_entries should only be increased if entry allocation
succeeds.
Doing it when it fails won't cause any problems other than wasting an
entry, but should be fixed anyway.
Link:
https://lkml.kernel.org/r/cad1ab28f75968db0f466925e7cba5970cec6c29.1643319703.git.zanussi@kernel.org
Cc: stable@vger.kernel.org
Fixes:
2f754e771b1a6
("tracing: Don't inc err_log entry count if entry allocation fails")
Signed-off-by: Tom Zanussi <zanussi@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/trace/trace.c
patch
|
blob
|
blame
|
history
diff --git
a/kernel/trace/trace.c
b/kernel/trace/trace.c
index cd2d094b9f820c8a7f3d1915173bda4041ea6544..a0729213f37be3740f3d0a96a916e928fef7cb4d 100644
(file)
--- a/
kernel/trace/trace.c
+++ b/
kernel/trace/trace.c
@@
-7257,7
+7257,8
@@
static struct tracing_log_err *get_tracing_log_err(struct trace_array *tr)
err = kzalloc(sizeof(*err), GFP_KERNEL);
if (!err)
err = ERR_PTR(-ENOMEM);
- tr->n_err_log_entries++;
+ else
+ tr->n_err_log_entries++;
return err;
}