From patchwork Tue Feb 20 03:58:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 136884 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BD97643AD8; Tue, 20 Feb 2024 05:00:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B9ED402DE; Tue, 20 Feb 2024 05:00:10 +0100 (CET) Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by mails.dpdk.org (Postfix) with ESMTP id 8AED04029B for ; Tue, 20 Feb 2024 05:00:07 +0100 (CET) Received: from mail.maildlp.com (unknown [172.19.163.44]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Tf5JN0Fw4zqjkB; Tue, 20 Feb 2024 11:59:32 +0800 (CST) Received: from dggpeml500024.china.huawei.com (unknown [7.185.36.10]) by mail.maildlp.com (Postfix) with ESMTPS id A0EB31400DB; Tue, 20 Feb 2024 12:00:05 +0800 (CST) Received: from localhost.localdomain (10.50.165.33) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 20 Feb 2024 12:00:05 +0800 From: Chengwen Feng To: CC: , Subject: [PATCH 3/4] cfgfile: verify add section and entry result Date: Tue, 20 Feb 2024 03:58:39 +0000 Message-ID: <20240220035840.32978-4-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240220035840.32978-1-fengchengwen@huawei.com> References: <20240220035840.32978-1-fengchengwen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.50.165.33] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500024.china.huawei.com (7.185.36.10) X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 --- 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 6f8f46a406..ad9314dc14 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: