From: Jim Cromie <jim.cromie@gmail.com>
To: jbaron@akamai.com, gregkh@linuxfoundation.org,
linux-kernel@vger.kernel.org
Cc: Jim Cromie <jim.cromie@gmail.com>
Subject: [RFC PATCH v6 11/34] dyndbg: accept null site in dynamic_emit_prefix
Date: Sat, 29 May 2021 14:00:06 -0600 [thread overview]
Message-ID: <20210529200029.205306-12-jim.cromie@gmail.com> (raw)
In-Reply-To: <20210529200029.205306-1-jim.cromie@gmail.com>
2 prints use site->member, protect them with if site.
no functional changes.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
lib/dynamic_debug.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index b2fd7c181bd5..868f56edf831 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -630,15 +630,19 @@ static char *__dynamic_emit_prefix(const struct _ddebug *dp, char *buf)
task_pid_vnr(current));
}
pos_after_tid = pos;
- if (dp->flags & _DPRINTK_FLAGS_INCL_MODNAME)
- pos += snprintf(buf + pos, remaining(pos), "%s:",
- desc->modname);
- if (dp->flags & _DPRINTK_FLAGS_INCL_FUNCNAME)
- pos += snprintf(buf + pos, remaining(pos), "%s:",
- desc->function);
+
+ if (desc) {
+ if (dp->flags & _DPRINTK_FLAGS_INCL_MODNAME)
+ pos += snprintf(buf + pos, remaining(pos), "%s:",
+ desc->modname);
+ if (dp->flags & _DPRINTK_FLAGS_INCL_FUNCNAME)
+ pos += snprintf(buf + pos, remaining(pos), "%s:",
+ desc->function);
+ }
if (dp->flags & _DPRINTK_FLAGS_INCL_LINENO)
pos += snprintf(buf + pos, remaining(pos), "%d:",
dp->lineno);
+
if (pos - pos_after_tid)
pos += snprintf(buf + pos, remaining(pos), " ");
if (pos >= PREFIX_SIZE)
--
2.31.1
next prev parent reply other threads:[~2021-05-29 20:02 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-29 19:59 [RFC PATCH v6 00/34] DYNAMIC_DEBUG diet progress, dropped 30kb Jim Cromie
2021-05-29 19:59 ` [RFC PATCH v6 01/34] dyndbg: avoid calling dyndbg_emit_prefix when it has no work Jim Cromie
2021-05-29 19:59 ` [RFC PATCH v6 02/34] dyndbg: drop uninformative vpr_info Jim Cromie
2021-05-29 19:59 ` [RFC PATCH v6 03/34] dyndbg: display KiB of data memory used Jim Cromie
2021-05-29 19:59 ` [RFC PATCH v6 04/34] dyndbg: split struct _ddebug's display fields to new _ddebug_site Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 05/34] dyndbg: __init iterate over __dyndbg & __dyndbg_site in parallel Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 06/34] dyndbg+module: expose ddebug_sites to modules Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 07/34] dyndbg: refactor part of ddebug_change to ddebug_match_site Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 08/34] dyndbg: accept null site in ddebug_match_site Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 09/34] dyndbg: hoist ->site out of ddebug_match_site Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 10/34] dyndbg: accept null site in ddebug_change Jim Cromie
2021-05-29 20:00 ` Jim Cromie [this message]
2021-05-29 20:00 ` [RFC PATCH v6 12/34] dyndbg: accept null site in ddebug_proc_show Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 13/34] dyndbg: refactor ddebug_alter_site out of ddebug_change Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 14/34] dyndbg: allow deleting site info via control interface Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 15/34] dyndbg: add ddebug_site(_get|_put) abstraction Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 16/34] dyndbg: ddebug_add_module avoid adding empty modules Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 17/34] dyndbg: add _index to struct _ddebug Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 18/34] dyndbg: prevent build bugs via -DNO_DYNAMIC_DEBUG_TABLE Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 19/34] dyndbg: RFC - DEFINE_DYNAMIC_DEBUG_TABLE Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 20/34] dyndbg: RFC handle __dyndbg* sections in module.lds.h Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 21/34] dyndbg: ddebug_add_module() handle headers Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 22/34] dyndbg: validate ddebug_site_get invariants Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 23/34] dyndbg: fix NULL deref after deleting sites Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 24/34] dyndbg: dont show header records in control Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 25/34] dyndbg: make site pointer and checks on it optional (almost) Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 26/34] dyndbg: swap WARN_ON for BUG_ON see what 0-day says Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 27/34] dyndbg: fixup protect header when deleting site Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 28/34] dyndbg: unionize _ddebug*_headers with struct _ddebug* Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 29/34] dyndbg: RFC drop _ddebug.site pointer Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 30/34] dyndbg: split/copy ._index into 2 new fields: ._back, ._map Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 31/34] dyndbg: detect repeated site recs in add_module Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 32/34] dyndbg: pack module pr_debug sites Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 33/34] dyndbg: pack pr-debug site-recs in builtin modules Jim Cromie
2021-05-29 20:00 ` [RFC PATCH v6 34/34] dyndbg: prototype print-once and print-ratelimited RFC Jim Cromie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210529200029.205306-12-jim.cromie@gmail.com \
--to=jim.cromie@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jbaron@akamai.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox