All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeremy Sowden <jeremy@azazel.net>
To: Netfilter Devel <netfilter-devel@vger.kernel.org>
Subject: [ulogd2 PATCH v4 26/32] db: simplify initialization of ring-buffer
Date: Tue, 30 Nov 2021 10:55:54 +0000	[thread overview]
Message-ID: <20211130105600.3103609-27-jeremy@azazel.net> (raw)
In-Reply-To: <20211130105600.3103609-1-jeremy@azazel.net>

Currently, `strncpy` is used to copy the SQL statement to the ring
buffer, passing the length of the source string, which leads gcc to
complain:

  ../../util/db.c:231:25: warning: `strncpy` specified bound depends on the length of the source argument

In fact, the ring buffer is sized to be a multiple of the size of the
SQL buffer, and the SQL is simply copied multiple times at increasing
offsets, so use `strcpy` instead.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 util/db.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/util/db.c b/util/db.c
index 339e39ef4797..c1d24365239f 100644
--- a/util/db.c
+++ b/util/db.c
@@ -228,9 +228,8 @@ int ulogd_db_start(struct ulogd_pluginstance *upi)
 			  di->ring.size, di->ring.length);
 		/* init start of query for each element */
 		for(i = 0; i < di->ring.size; i++) {
-			strncpy(di->ring.ring + di->ring.length * i + 1,
-				di->stmt,
-				strlen(di->stmt));
+			strcpy(di->ring.ring + di->ring.length * i + 1,
+			       di->stmt);
 		}
 		/* init cond & mutex */
 		ret = pthread_cond_init(&di->ring.cond, NULL);
-- 
2.33.0


  parent reply	other threads:[~2021-11-30 11:15 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-30 10:55 [ulogd2 PATCH v4 00/32] Fixes for compiler warnings Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 01/32] jhash: add "fall through" comments to switch cases Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 02/32] db: add missing `break` to switch case Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 03/32] filter: HWHDR: simplify flow-control Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 04/32] filter: HWHDR: re-order KEY_RAW_MAC checks Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 05/32] filter: HWHDR: remove zero-initialization of MAC type Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 06/32] Replace malloc+memset with calloc Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 07/32] filter: PWSNIFF: replace malloc+strncpy with strndup Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 08/32] input: UNIXSOCK: remove stat of socket-path Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 09/32] input: UNIXSOCK: fix possible truncation of socket path Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 10/32] input: UNIXSOCK: prevent unaligned pointer access Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 11/32] output: DBI: fix deprecation warnings Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 12/32] output: DBI: improve mapping of DB columns to input-keys Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 13/32] output: DBI: fix NUL-termination of escaped SQL string Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 14/32] output: DBI: fix configuration of DB connection Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 15/32] output: MYSQL: improve mapping of DB columns to input-keys Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 16/32] output: PGSQL: " Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 17/32] output: PGSQL: fix non-`connstring` configuration of DB connection Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 18/32] output: SQLITE3: fix possible buffer overruns Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 19/32] output: SQLITE3: fix memory-leak in error-handling Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 20/32] output: SQLITE3: improve formatting of insert statement Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 21/32] output: SQLITE3: improve mapping of DB columns to fields Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 22/32] output: SQLITE3: improve mapping of fields to DB columns Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 23/32] output: SQLITE3: catch errors creating SQL statement Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 24/32] db: improve formatting of insert statement Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 25/32] db: improve mapping of input-keys to DB columns Jeremy Sowden
2021-11-30 10:55 ` Jeremy Sowden [this message]
2021-11-30 10:55 ` [ulogd2 PATCH v4 27/32] output: JSON: fix output of GMT offset Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 28/32] output: JSON: increase time-stamp buffer size Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 29/32] output: JSON: fix possible leak in error-handling Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 30/32] output: JSON: optimize appending of newline to output Jeremy Sowden
2021-11-30 10:55 ` [ulogd2 PATCH v4 31/32] output: JSON: fix possible truncation of socket path Jeremy Sowden
2021-11-30 10:56 ` [ulogd2 PATCH v4 32/32] output: IPFIX: remove compiler attribute macros Jeremy Sowden
2021-12-06 22:20 ` [ulogd2 PATCH v4 00/32] Fixes for compiler warnings Pablo Neira Ayuso
2022-01-03 18:10   ` Pablo Neira Ayuso
2022-01-05 22:48     ` Jeremy Sowden
2022-01-10  0:22       ` Pablo Neira Ayuso
2022-01-06 21:00     ` Jeremy Sowden

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=20211130105600.3103609-27-jeremy@azazel.net \
    --to=jeremy@azazel.net \
    --cc=netfilter-devel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.