From: Chengwen Feng <fengchengwen@huawei.com>
To: <thomas@monjalon.net>
Cc: <dev@dpdk.org>, <cristian.dumitrescu@intel.com>,
<stephen@networkplumber.org>, <david.marchand@redhat.com>
Subject: [PATCH v2 3/4] cfgfile: verify add section and entry result
Date: Fri, 5 Jul 2024 09:31:14 +0000 [thread overview]
Message-ID: <20240705093115.4437-4-fengchengwen@huawei.com> (raw)
In-Reply-To: <20240705093115.4437-1-fengchengwen@huawei.com>
The rte_cfgfile_add_section() and _add_entry()'s result were not
verified, so that potential errors may not be detected.
This commit adds the verification.
Cc: stable@dpdk.org
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/cfgfile/rte_cfgfile.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/lib/cfgfile/rte_cfgfile.c b/lib/cfgfile/rte_cfgfile.c
index 97a399635e..3033cff4a4 100644
--- a/lib/cfgfile/rte_cfgfile.c
+++ b/lib/cfgfile/rte_cfgfile.c
@@ -182,6 +182,7 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
char buffer[CFG_NAME_LEN + CFG_VALUE_LEN + 4];
int lineno = 0;
struct rte_cfgfile *cfg;
+ int ret;
if (rte_cfgfile_check_params(params))
return NULL;
@@ -226,7 +227,9 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
*end = '\0';
_strip(&buffer[1], end - &buffer[1]);
- rte_cfgfile_add_section(cfg, &buffer[1]);
+ ret = rte_cfgfile_add_section(cfg, &buffer[1]);
+ if (ret != 0)
+ goto error1;
} else {
/* key and value line */
char *split[2] = {NULL};
@@ -261,8 +264,10 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
if (cfg->num_sections == 0)
goto error1;
- _add_entry(&cfg->sections[cfg->num_sections - 1],
- split[0], split[1]);
+ ret = _add_entry(&cfg->sections[cfg->num_sections - 1],
+ split[0], split[1]);
+ if (ret != 0)
+ goto error1;
}
}
fclose(f);
@@ -277,6 +282,7 @@ struct rte_cfgfile *
rte_cfgfile_create(int flags)
{
int i;
+ int ret;
struct rte_cfgfile *cfg;
/* future proof flags usage */
@@ -310,8 +316,11 @@ rte_cfgfile_create(int flags)
cfg->sections[i].allocated_entries = CFG_ALLOC_ENTRY_BATCH;
}
- if (flags & CFG_FLAG_GLOBAL_SECTION)
- rte_cfgfile_add_section(cfg, "GLOBAL");
+ if (flags & CFG_FLAG_GLOBAL_SECTION) {
+ ret = rte_cfgfile_add_section(cfg, "GLOBAL");
+ if (ret != 0)
+ goto error1;
+ }
return cfg;
error1:
--
2.17.1
next prev parent reply other threads:[~2024-07-05 9:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-20 3:58 [PATCH 0/4] cfgfile: enhance error detecting Chengwen Feng
2024-02-20 3:58 ` [PATCH 1/4] cfgfile: remove dead code Chengwen Feng
2024-07-04 21:28 ` Stephen Hemminger
2024-02-20 3:58 ` [PATCH 2/4] cfgfile: support verify name and value Chengwen Feng
2024-07-04 21:29 ` Stephen Hemminger
2024-02-20 3:58 ` [PATCH 3/4] cfgfile: verify add section and entry result Chengwen Feng
2024-07-04 21:30 ` Stephen Hemminger
2024-02-20 3:58 ` [PATCH 4/4] cfgfile: add unique name flag Chengwen Feng
2024-07-04 21:36 ` Stephen Hemminger
2024-07-05 9:37 ` fengchengwen
2024-07-04 15:12 ` [PATCH 0/4] cfgfile: enhance error detecting David Marchand
2024-07-05 0:14 ` Stephen Hemminger
2024-07-05 0:29 ` Stephen Hemminger
2024-07-04 21:40 ` Stephen Hemminger
2024-07-05 8:39 ` Bruce Richardson
2024-07-05 9:31 ` [PATCH v2 " Chengwen Feng
2024-07-05 9:31 ` [PATCH v2 1/4] cfgfile: remove dead code Chengwen Feng
2024-07-05 9:31 ` [PATCH v2 2/4] cfgfile: support verify name and value Chengwen Feng
2024-07-05 9:31 ` Chengwen Feng [this message]
2024-07-05 9:31 ` [PATCH v2 4/4] cfgfile: add strict parse flag Chengwen Feng
2024-09-06 1:03 ` [PATCH v2 0/4] cfgfile: enhance error detecting fengchengwen
2024-10-09 22:47 ` Stephen Hemminger
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=20240705093115.4437-4-fengchengwen@huawei.com \
--to=fengchengwen@huawei.com \
--cc=cristian.dumitrescu@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=stephen@networkplumber.org \
--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).