diff mbox series

[ulogd2,01/34] ulogd: fix parse-error check

Message ID	20221121222611.3914559-2-jeremy@azazel.net
State	Changes Requested
Delegated to:	Pablo Neira
Headers	show Return-Path: <netfilter-devel-owner@vger.kernel.org> From: Jeremy Sowden <jeremy@azazel.net> To: Netfilter Devel <netfilter-devel@vger.kernel.org> Subject: [PATCH ulogd2 01/34] ulogd: fix parse-error check Date: Mon, 21 Nov 2022 22:25:38 +0000 Message-Id: <20221121222611.3914559-2-jeremy@azazel.net> In-Reply-To: <20221121222611.3914559-1-jeremy@azazel.net> References: <20221121222611.3914559-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Refactor of the DB output plug-ins \| expand [ulogd2,00/34] Refactor of the DB output plug-ins [ulogd2,01/34] ulogd: fix parse-error check [ulogd2,02/34] filter: fix buffer overruns in filter plug-ins [ulogd2,03/34] output: JSON: remove incorrect config value check [ulogd2,04/34] db: fix back-log capacity checks [ulogd2,05/34] build: add checks to configure.ac [ulogd2,06/34] src: remove some trailing white space [ulogd2,07/34] src: remove zero-valued config-key fields [ulogd2,08/34] src: parenthesize config-entry macro arguments [ulogd2,09/34] src: define constructors and destructors consistently [ulogd2,10/34] src: remove `TIME_ERR` macro [ulogd2,11/34] src: remove superfluous casts [ulogd2,12/34] conffile: replace malloc+strcpy with strdup [ulogd2,13/34] output: remove zero-initialized `struct ulogd_plugin` members [ulogd2,14/34] output: de-duplicate allocation of input keys [ulogd2,15/34] db: reorganize source [ulogd2,16/34] db: use consistent integer return values to indicate errors [ulogd2,17/34] db: change return type of two functions to `void` [ulogd2,18/34] db: open-code `_loop_reconnect_db` [ulogd2,19/34] db: improve calculation of sql statement length [ulogd2,20/34] db: refactor configuration [ulogd2,21/34] db: refactor ring-buffer initialization [ulogd2,22/34] db: refactor ring-buffer [ulogd2,23/34] db: refactor backlog [ulogd2,24/34] db: use `struct db_stmt` objects more widely [ulogd2,25/34] db: synchronize access to ring-buffer [ulogd2,26/34] db: avoid cancelling ring-buffer thread [ulogd2,27/34] db, IP2BIN: defer formatting of raw strings [ulogd2,28/34] db: add prep & exec support [ulogd2,29/34] output: mysql: add prep & exec support [ulogd2,30/34] output: pgsql: remove a couple of struct members [ulogd2,31/34] output: pgsql: remove variable-length arrays [ulogd2,32/34] output: pgsql: tidy up `open_db_pgsql` and fix memory leak [ulogd2,33/34] output: pgsql: add prep & exec support [ulogd2,34/34] output: sqlite3: reimplement using the common DB API

Commit Message

Jeremy Sowden Nov. 21, 2022, 10:25 p.m. UTC

If `config_parse_file` returns `-ERRTOOLONG`, `config_errce` may
be NULL.  However, the calling function was checking whether
`config_errce->key` was NULL instead.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 src/ulogd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/src/ulogd.c b/src/ulogd.c
index b02f2602a895..8ea9793ec0fb 100644
--- a/src/ulogd.c
+++ b/src/ulogd.c
@@ -1134,7 +1134,7 @@  static int parse_conffile(const char *section, struct config_keyset *ce)
 				"section \"%s\" not found\n", section);
 			break;
 		case -ERRTOOLONG:
-			if (config_errce->key)
+			if (config_errce)
 				ulogd_log(ULOGD_ERROR,
 					  "string value too long for key \"%s\"\n",
 					  config_errce->key);