From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6BC8C433F5 for ; Sat, 30 Oct 2021 17:10:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B9E0603E8 for ; Sat, 30 Oct 2021 17:10:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230338AbhJ3RN0 (ORCPT ); Sat, 30 Oct 2021 13:13:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230400AbhJ3RN0 (ORCPT ); Sat, 30 Oct 2021 13:13:26 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:fb7d:d6d6:e0:4cff:fe83:e514]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 168FEC061570 for ; Sat, 30 Oct 2021 10:10:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=An35OZztWQ8E5cfOE34E9MFys0c7CYVIuG4W353XS6E=; b=QS6vovYBEqAvNCF8iXcAwpbpTu 33ruxJfDhgljMNOVi9RE+SuZTAmAQJkTOvGXjepfG//xAdcCEitUqTe1wys/fMb6j5dQNshPXO56A fpmpgrgPx36JQtxLw4iXT5zqx2qCoimrNb2paoRrAas0uZh2lr/n57+c6zbbEWIb0knGhA3djHs+W iyNwCpsPdpx2YFu8ZINg80edOsYE7dNgJ9E9vg7X6iu4ZrMq+IWsUQAaDXZwaEqvVeyOSvvVWn/Z5 d9LwEgIMVdSB4jBqC4sXeIVSzLrXW6KpkS3FSlzvgwNMk4bVsYBMu1doKpdsD8oUM696uuseOitfP jd3tHydA==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae] helo=ulthar.scientificgames.com) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1mgrTA-00AFgT-Cg for netfilter-devel@vger.kernel.org; Sat, 30 Oct 2021 17:44:36 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [ulogd2 PATCH 18/26] output: MYSQL: Fix string truncation warning Date: Sat, 30 Oct 2021 17:44:24 +0100 Message-Id: <20211030164432.1140896-19-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211030164432.1140896-1-jeremy@azazel.net> References: <20211030164432.1140896-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Replace `strncpy` with `snprintf`. Remove superfluous intermediate buffer. Signed-off-by: Jeremy Sowden --- output/mysql/ulogd_output_MYSQL.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/output/mysql/ulogd_output_MYSQL.c b/output/mysql/ulogd_output_MYSQL.c index 66151feb4939..946498d4d2fe 100644 --- a/output/mysql/ulogd_output_MYSQL.c +++ b/output/mysql/ulogd_output_MYSQL.c @@ -135,18 +135,17 @@ static int get_columns_mysql(struct ulogd_pluginstance *upi) } for (i = 0; (field = mysql_fetch_field(result)); i++) { - char buf[ULOGD_MAX_KEYLEN+1]; char *underscore; + snprintf(upi->input.keys[i].name, + sizeof(upi->input.keys[i].name), + "%s", field->name); /* replace all underscores with dots */ - strncpy(buf, field->name, ULOGD_MAX_KEYLEN); - while ((underscore = strchr(buf, '_'))) + for (underscore = upi->input.keys[i].name; + (underscore = strchr(underscore, '_')); ) *underscore = '.'; - DEBUGP("field '%s' found\n", buf); - - /* add it to list of input keys */ - strncpy(upi->input.keys[i].name, buf, ULOGD_MAX_KEYLEN); + DEBUGP("field '%s' found\n", upi->input.keys[i].name); } /* MySQL Auto increment ... ID :) */ upi->input.keys[0].flags |= ULOGD_KEYF_INACTIVE; -- 2.33.0