Message ID | 20211124222444.2597311-22-jeremy@azazel.net |
---|---|
State | Changes Requested |
Delegated to: | Pablo Neira |
Headers | show
Return-Path: <netfilter-devel-owner@vger.kernel.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=N7Bu9NXS; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=<UNKNOWN>) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4Hzx0Z6Hgvz9sR4 for <incoming@patchwork.ozlabs.org>; Thu, 25 Nov 2021 09:45:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343507AbhKXWsJ (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Wed, 24 Nov 2021 17:48:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244645AbhKXWsI (ORCPT <rfc822;netfilter-devel@vger.kernel.org>); Wed, 24 Nov 2021 17:48:08 -0500 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32E35C061574 for <netfilter-devel@vger.kernel.org>; Wed, 24 Nov 2021 14:44:58 -0800 (PST) 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=boTbZSMkjfDyb2lcl+6LCjVcfVD9RLBEcZFjLZrj7O4=; b=N7Bu9NXSAm/Vn3+ea6edDnSSKa cuu4G6pjZhdDgV5aevZ+gvgDGVx7CobCIXJc9HEup2Kck+vdpotMH2pZeHN6ssiT/IyIFMuLOqkj5 iJUZAy1HNFyWDc7Exlw/1m5uFAc58PD+ZjoEs4VmmYPqfa4XOsk3xqKo107EXvyINQVwZ5NXMD0Lz rheaAmvZ2sh4ihjGfL4MXv08oxJyebtZPlWBiiIXrqW+2OGWSWCiYhy81JXEdbbEdk0Ol2JO+0GkE gFuptVhknDBaAJLKmrCcGpKW7d/x9PepCFcoPSR6Qd/3NyxX+QMacBruQTaC11wCf1Ig5s+q+N+F5 CScF0Pxg==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from <jeremy@azazel.net>) id 1mq0h8-00563U-8S for netfilter-devel@vger.kernel.org; Wed, 24 Nov 2021 22:24:50 +0000 From: Jeremy Sowden <jeremy@azazel.net> To: Netfilter Devel <netfilter-devel@vger.kernel.org> Subject: [ulogd2 PATCH v3 17/30] output: SQLITE3: fix memory-leak in error-handling Date: Wed, 24 Nov 2021 22:24:16 +0000 Message-Id: <20211124222444.2597311-22-jeremy@azazel.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211124222444.2597311-1-jeremy@azazel.net> References: <20211124222444.2597311-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: <netfilter-devel.vger.kernel.org> X-Mailing-List: netfilter-devel@vger.kernel.org |
Series |
Fixes for compiler warnings
|
expand
|
diff --git a/output/sqlite3/ulogd_output_SQLITE3.c b/output/sqlite3/ulogd_output_SQLITE3.c index 554b1b34488c..41aeeec27854 100644 --- a/output/sqlite3/ulogd_output_SQLITE3.c +++ b/output/sqlite3/ulogd_output_SQLITE3.c @@ -342,8 +342,12 @@ sqlite3_init_db(struct ulogd_pluginstance *pi) } strncpy(f->name, buf, ULOGD_MAX_KEYLEN); - if ((f->key = ulogd_find_key(pi, buf)) == NULL) + if ((f->key = ulogd_find_key(pi, buf)) == NULL) { + ulogd_log(ULOGD_ERROR, + "SQLITE3: unknown input key: %s\n", buf); + free(f); return -1; + } TAILQ_INSERT_TAIL(&priv->fields, f, link); }
When mapping DB column names to input-keys, if we cannot find a key to match a column, the newly allocated `struct field` is leaked. Free it, and log an error message. Signed-off-by: Jeremy Sowden <jeremy@azazel.net> --- output/sqlite3/ulogd_output_SQLITE3.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)