From: Olivier Matz <olivier.matz@6wind.com>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com, jianfeng.tan@intel.com, thomas@monjalon.net
Subject: [dpdk-dev] [PATCH 5/6] eal: fix log level regexp matching
Date: Tue, 18 Apr 2017 16:22:24 +0200 [thread overview]
Message-ID: <20170418142225.6308-5-olivier.matz@6wind.com> (raw)
In-Reply-To: <20170418142225.6308-1-olivier.matz@6wind.com>
Fix misuse of regular expression functions, which was producing a
segfault.
After the patch, it works properly:
$ ./build/app/test --no-huge --log-level=pmd,3
RTE>>dump_log_types
[...]
id 30: user7, level is debug
id 31: user8, level is debug
id 32: pmd.i40e.init, level is critical
id 33: pmd.i40e.driver, level is critical
Fixes: a5279180f510 ("eal: change several log levels matching a regexp")
Coverity issue: 143472
Reported-by: Jianfeng Tan <jianfeng.tan@intel.com>
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
lib/librte_eal/common/eal_common_log.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c
index 7d13cc026..c2957d167 100644
--- a/lib/librte_eal/common/eal_common_log.c
+++ b/lib/librte_eal/common/eal_common_log.c
@@ -159,10 +159,14 @@ rte_log_set_level_regexp(const char *pattern, uint32_t level)
if (level > RTE_LOG_DEBUG)
return -1;
+ if (regcomp(&r, pattern, 0) != 0)
+ return -1;
+
for (i = 0; i < rte_logs.dynamic_types_len; i++) {
if (rte_logs.dynamic_types[i].name == NULL)
continue;
- if (regexec(&r, pattern, 0, NULL, 0) == 0)
+ if (regexec(&r, rte_logs.dynamic_types[i].name, 0,
+ NULL, 0) == 0)
rte_logs.dynamic_types[i].loglevel = level;
}
--
2.11.0
next prev parent reply other threads:[~2017-04-18 14:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-18 14:22 [dpdk-dev] [PATCH 1/6] eal: fix default log level Olivier Matz
2017-04-18 14:22 ` [dpdk-dev] [PATCH 2/6] eal: move internal config initialization Olivier Matz
2017-04-18 14:22 ` [dpdk-dev] [PATCH 3/6] eal: remove log level from internal config Olivier Matz
2017-04-18 15:00 ` Ferruh Yigit
2017-04-18 15:26 ` Olivier MATZ
2017-04-18 15:28 ` Ferruh Yigit
2017-04-18 14:22 ` [dpdk-dev] [PATCH 4/6] eal: remove undue printf Olivier Matz
2017-04-18 14:22 ` Olivier Matz [this message]
2017-04-18 14:22 ` [dpdk-dev] [PATCH 6/6] eal: fix dump of registered logs when disabled Olivier Matz
2017-04-18 15:29 ` [dpdk-dev] [PATCH 1/6] eal: fix default log level Ferruh Yigit
2017-04-19 23:31 ` Thomas Monjalon
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=20170418142225.6308-5-olivier.matz@6wind.com \
--to=olivier.matz@6wind.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=jianfeng.tan@intel.com \
--cc=thomas@monjalon.net \
/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;
as well as URLs for NNTP newsgroup(s).