From patchwork Sun Oct 25 13:15:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387217 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=T0BQBoqy; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz4T5qXxz9sVD for ; Mon, 26 Oct 2020 00:16:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416218AbgJYNQH (ORCPT ); Sun, 25 Oct 2020 09:16:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1416210AbgJYNQG (ORCPT ); Sun, 25 Oct 2020 09:16:06 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AF36C0613CE for ; Sun, 25 Oct 2020 06:16:06 -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:Cc:To:From:Sender:Reply-To: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=l4PPqK2vADhMT0fcZSml2DXdVhcg9EUG6Oyc0gC6wWE=; b=T0BQBoqyw1D/EIA/LPwvT46ksc NWsjqmL0m6VWhP9wWlv8Xt04uZb6gYCbILWeiAh2C+hr9E8zGxiUUTp0kpR0AHb9faMmRVzVAkHgm Vb3tAxAepSiO4sj3MOJMdOTglUtX/Kb344f7AHNdIPlimSoJEFC/jKFB5J8NzvtbYsfaB/iacmwjO idhaPYKryA0syCWTIL6A3+T8oSIHYJNNClXz+WPCjH8Flckw7quRaKkxBuvcRqzmOJ25Ze+eug/7I Sd0LK1dlo7pjlrJkVOcmXTewvjOBScm2PphQh37DN+zbKDgw8OLwXpnATusQxw8kFqWfMN/XzIRyf Vpsz7ylw==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsS-0001SE-MA; Sun, 25 Oct 2020 13:16:04 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 01/13] pknock: pknlusr: ensure man-page is included by `make dist`. Date: Sun, 25 Oct 2020 13:15:47 +0000 Message-Id: <20201025131559.920038-3-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 Signed-off-by: Jeremy Sowden --- extensions/pknock/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/pknock/Makefile.am b/extensions/pknock/Makefile.am index e62c10884048..35528709aa15 100644 --- a/extensions/pknock/Makefile.am +++ b/extensions/pknock/Makefile.am @@ -6,4 +6,4 @@ AM_CFLAGS = ${regular_CFLAGS} ${libxtables_CFLAGS} include ../../Makefile.extra sbin_PROGRAMS = pknlusr -man_MANS = pknlusr.8 +dist_man_MANS = pknlusr.8 From patchwork Sun Oct 25 13:15:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387225 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=a+6Kadii; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz4f1TjFz9sVM for ; Mon, 26 Oct 2020 00:16:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416230AbgJYNQO (ORCPT ); Sun, 25 Oct 2020 09:16:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1416213AbgJYNQG (ORCPT ); Sun, 25 Oct 2020 09:16:06 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BDA0C0613D4 for ; Sun, 25 Oct 2020 06:16:06 -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:Cc:To:From:Sender:Reply-To: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=LUWiGDDi8jt5gNy8euEWMKWf3FlJdvW9DFNK4/PeHQ8=; b=a+6KadiimYGuo+l8RUqSxqMgrp +I+pbCP3RJ85NIFxNVag62dqINJ1jvokYd1XWUdWUjpqada2A5TbZosi1/dsEquHPm/yqE4mVn7MB 8dmTtrxL8LafUHKU1Xfu6kq+4RHfEqn/ZlEtim2agC/s35h7CAVfUAP21z9FN1sfXj9ck2aTNlnAc YovgpVsN3v6os7sdrmmBBvVYAfONihggfL9ncIISJNm+zF8l68aEF+P0iQyNYixSdEo6qOjd8shrA ry4v9D0YYZB/5W7Ia2Ve6lqN2d/fohPAIgfrLv0A08HWv3tj1XNLCZs4otiX33T682iSd2kR93RmK BsD+wJfA==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsS-0001SE-Vz; Sun, 25 Oct 2020 13:16:05 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 02/13] pknock: pknlusr: remove dest_addr and rename src_addr. Date: Sun, 25 Oct 2020 13:15:48 +0000 Message-Id: <20201025131559.920038-4-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 We only need to specify the address at our end, and given that we are receiving messages, not sending them, calling it `src_addr` is misleading. Signed-off-by: Jeremy Sowden --- extensions/pknock/pknlusr.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/extensions/pknock/pknlusr.c b/extensions/pknock/pknlusr.c index 14bc44a13887..4e3e02a0b9f0 100644 --- a/extensions/pknock/pknlusr.c +++ b/extensions/pknock/pknlusr.c @@ -12,7 +12,7 @@ #define GROUP 1 -static struct sockaddr_nl src_addr, dest_addr; +static struct sockaddr_nl local_addr; static int sock_fd; static unsigned char *buf; @@ -21,7 +21,6 @@ static struct xt_pknock_nl_msg *nlmsg; int main(void) { - socklen_t addrlen; int status; int group = GROUP; @@ -37,12 +36,12 @@ int main(void) return 1; } - memset(&src_addr, 0, sizeof(src_addr)); - src_addr.nl_family = AF_NETLINK; - src_addr.nl_pid = getpid(); - src_addr.nl_groups = group; + memset(&local_addr, 0, sizeof(local_addr)); + local_addr.nl_family = AF_NETLINK; + local_addr.nl_pid = getpid(); + local_addr.nl_groups = group; - status = bind(sock_fd, (struct sockaddr*)&src_addr, sizeof(src_addr)); + status = bind(sock_fd, (struct sockaddr*)&local_addr, sizeof(local_addr)); if (status == -1) { close(sock_fd); @@ -50,11 +49,6 @@ int main(void) return 1; } - memset(&dest_addr, 0, sizeof(dest_addr)); - dest_addr.nl_family = AF_NETLINK; - dest_addr.nl_pid = 0; - dest_addr.nl_groups = group; - buf_size = sizeof(struct xt_pknock_nl_msg) + sizeof(struct cn_msg) + sizeof(struct nlmsghdr); buf = malloc(buf_size); @@ -63,16 +57,14 @@ int main(void) return 1; } - addrlen = sizeof(dest_addr); - while(1) { memset(buf, 0, buf_size); - status = recvfrom(sock_fd, buf, buf_size, 0, (struct sockaddr *)&dest_addr, &addrlen); + status = recv(sock_fd, buf, buf_size, 0); if (status <= 0) { - perror("recvfrom()"); + perror("recv()"); return 1; } nlmsg = (struct xt_pknock_nl_msg *)(buf + sizeof(struct cn_msg) + sizeof(struct nlmsghdr)); From patchwork Sun Oct 25 13:15:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387224 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=IRVJHCac; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz4d48Nnz9sVN for ; Mon, 26 Oct 2020 00:16:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416229AbgJYNQN (ORCPT ); Sun, 25 Oct 2020 09:16:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1416214AbgJYNQH (ORCPT ); Sun, 25 Oct 2020 09:16:07 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C93FCC0613D5 for ; Sun, 25 Oct 2020 06:16:06 -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:Cc:To:From:Sender:Reply-To: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=1gwp9Sfej2IAD4Kbg80SXLVX4/NLD0VbWfWINGSvkQk=; b=IRVJHCacJ4U0/jsjVe+sGYWclW S1pMKBbwn5S5iW/n5FtMg/UB8sR/jHe1vRtP5YX1U1mnw/WwwmCX+PG112YXWVXqjNxOdlldS+tGi 1RHYDLKVL7xbBigO4WEzWorjmMpzYaJ+cZdJidPmiYE8jCVLVsIiYqW1d5DnifdHyjnHDEbCLNqho b1dllZvUvXkZp1XvGWXp/ucf0PbbrnbO3z70g5Bcc2+i6nloubc+Xb4f2l42N/o2vD+LGgbc+TVI3 6by7rTVh3HDHPJF+tfo/XkUCPZTX1wXyA05SCH2bs7S7owEajb8VjBjmlHpjKH3J0PHMUJWE6ItAE l9xbL0DA==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsT-0001SE-At; Sun, 25 Oct 2020 13:16:05 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 03/13] pknock: pknlusr: tighten up variable scopes. Date: Sun, 25 Oct 2020 13:15:49 +0000 Message-Id: <20201025131559.920038-5-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 Make global variables local, and move variables local to while-loop into the loop. Signed-off-by: Jeremy Sowden --- extensions/pknock/pknlusr.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/extensions/pknock/pknlusr.c b/extensions/pknock/pknlusr.c index 4e3e02a0b9f0..808b737f1db2 100644 --- a/extensions/pknock/pknlusr.c +++ b/extensions/pknock/pknlusr.c @@ -12,22 +12,16 @@ #define GROUP 1 -static struct sockaddr_nl local_addr; -static int sock_fd; - -static unsigned char *buf; - -static struct xt_pknock_nl_msg *nlmsg; - int main(void) { int status; int group = GROUP; - int buf_size; + struct sockaddr_nl local_addr; + int sock_fd; - const char *ip; - char ipbuf[48]; + int buf_size; + unsigned char *buf; sock_fd = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR); @@ -59,6 +53,11 @@ int main(void) while(1) { + struct xt_pknock_nl_msg *nlmsg; + + const char *ip; + char ipbuf[48]; + memset(buf, 0, buf_size); status = recv(sock_fd, buf, buf_size, 0); From patchwork Sun Oct 25 13:15:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387219 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=NxVBWlBZ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz4X1xbvz9sTq for ; Mon, 26 Oct 2020 00:16:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416224AbgJYNQJ (ORCPT ); Sun, 25 Oct 2020 09:16:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1416215AbgJYNQH (ORCPT ); Sun, 25 Oct 2020 09:16:07 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23317C0613D6 for ; Sun, 25 Oct 2020 06:16:07 -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:Cc:To:From:Sender:Reply-To: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=rWtAwLsHZlbt+7ru4uruwoqfR8VbpKWfFs2d6OBm67o=; b=NxVBWlBZnK7KR9BhtV7MtZlnyO RVVVep8BQhyQBnzlJKVc2g23BLB8g3vSCSqNBqmepAvg8h7hF6UbuAua5xI/aCSxnh9CbzYhvaRWB CekASZMnOI6lGEY+A9rNpect3XmwII5YjtQhLTfdhOOw9or7YDD//v9jMW/ym0tq3UxbNPFF5cGht T9rSitxwruuNO2shEbP7Kik5V1/lDiCxVQduotJOVecYzUk+mvmOan34n/UJwKWgJwvd70VAfbA1J fHPDqr5TXKWIgkh59T60zrUIUypeISll7BafjtGkWsMbYeiGjhrwE3D99p40fPtHBJiiW3EqsvAiV J9uzIeLA==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsT-0001SE-Kk; Sun, 25 Oct 2020 13:16:05 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 04/13] pknock: pknlusr: tidy up initialization of local address. Date: Sun, 25 Oct 2020 13:15:50 +0000 Message-Id: <20201025131559.920038-6-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 Use struct initialization and drop memset. We don't need to set the port ID, since the kernel will do it for us. Signed-off-by: Jeremy Sowden --- extensions/pknock/pknlusr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/extensions/pknock/pknlusr.c b/extensions/pknock/pknlusr.c index 808b737f1db2..ed741599558b 100644 --- a/extensions/pknock/pknlusr.c +++ b/extensions/pknock/pknlusr.c @@ -17,7 +17,7 @@ int main(void) int status; int group = GROUP; - struct sockaddr_nl local_addr; + struct sockaddr_nl local_addr = { .nl_family = AF_NETLINK }; int sock_fd; int buf_size; @@ -30,9 +30,6 @@ int main(void) return 1; } - memset(&local_addr, 0, sizeof(local_addr)); - local_addr.nl_family = AF_NETLINK; - local_addr.nl_pid = getpid(); local_addr.nl_groups = group; status = bind(sock_fd, (struct sockaddr*)&local_addr, sizeof(local_addr)); From patchwork Sun Oct 25 13:15:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387221 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=j1xye2EA; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz4Z5GR5z9sVD for ; Mon, 26 Oct 2020 00:16:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416226AbgJYNQL (ORCPT ); Sun, 25 Oct 2020 09:16:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1416216AbgJYNQH (ORCPT ); Sun, 25 Oct 2020 09:16:07 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DA8DC0613D7 for ; Sun, 25 Oct 2020 06:16:07 -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:Cc:To:From:Sender:Reply-To: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=nfWXc5JEFWpJhWHhyTt+vjN+n8ZVp082hYpO+KvKboE=; b=j1xye2EAIt24FzsswH9usEJ2AL jJr2qmt+s73WA3xicqwiih8x6tkugxVtr5Wk8iUmXeiG0Z0egCghJmJpuItLYjLSi4aPzeSMnE6vk lz3Kzr20OCTq8geOBqYBUaZqBJ+UTdueGgTbzfqLqUk163WgY8Cf3Blg+LI7X1fHVTsBLu1h1+/cN kS1364Ih1/t9LwYJT1H8yO3KYkYQKdnCsGCEWUg26LxozvyXQpg6jc5kR1345BAUGStzPTwT2fqMD bVQAZ9rVbJR7ZgvrOJKo7evq1daYW4zNDyAmoDaqxop5sjcReEnLbGf/fvsbIJp28WnumpIu8lxIG 3RL4gbMQ==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsT-0001SE-Ty; Sun, 25 Oct 2020 13:16:06 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 05/13] pknock: pknlusr: use NLMSG macros and proper types, rather than arithmetic on char pointers. Date: Sun, 25 Oct 2020 13:15:51 +0000 Message-Id: <20201025131559.920038-7-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 Signed-off-by: Jeremy Sowden --- extensions/pknock/pknlusr.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/extensions/pknock/pknlusr.c b/extensions/pknock/pknlusr.c index ed741599558b..252fd42ffecd 100644 --- a/extensions/pknock/pknlusr.c +++ b/extensions/pknock/pknlusr.c @@ -20,8 +20,10 @@ int main(void) struct sockaddr_nl local_addr = { .nl_family = AF_NETLINK }; int sock_fd; - int buf_size; - unsigned char *buf; + size_t nlmsg_size; + struct nlmgrhdr *nlmsg; + struct cn_msg *cn_msg; + struct xt_pknock_nl_msg *pknock_msg; sock_fd = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR); @@ -40,38 +42,38 @@ int main(void) return 1; } - buf_size = sizeof(struct xt_pknock_nl_msg) + sizeof(struct cn_msg) + sizeof(struct nlmsghdr); - buf = malloc(buf_size); + nlmsg_size = NLMSG_SPACE(sizeof(*cn_msg) + sizeof(*pknock_msg)); + nlmsg = malloc(nlmsg_size); - if (!buf) { + if (!nlmsg) { perror("malloc()"); return 1; } while(1) { - struct xt_pknock_nl_msg *nlmsg; - const char *ip; char ipbuf[48]; - memset(buf, 0, buf_size); + memset(nlmsg, 0, nlmsg_size); - status = recv(sock_fd, buf, buf_size, 0); + status = recv(sock_fd, nlmsg, nlmsg_size, 0); if (status <= 0) { perror("recv()"); return 1; } - nlmsg = (struct xt_pknock_nl_msg *)(buf + sizeof(struct cn_msg) + sizeof(struct nlmsghdr)); - ip = inet_ntop(AF_INET, &nlmsg->peer_ip, ipbuf, sizeof(ipbuf)); - printf("rule_name: %s - ip %s\n", nlmsg->rule_name, ip); + + cn_msg = NLMSG_DATA(nlmsg); + pknock_msg = (struct xt_pknock_nl_msg *)(cn_msg->data); + ip = inet_ntop(AF_INET, &pknock_msg->peer_ip, ipbuf, sizeof(ipbuf)); + printf("rule_name: %s - ip %s\n", pknock_msg->rule_name, ip); } close(sock_fd); - free(buf); + free(nlmsg); return 0; } From patchwork Sun Oct 25 13:15:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387220 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=J2lNaz9y; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz4Y3QHGz9sVM for ; Mon, 26 Oct 2020 00:16:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416225AbgJYNQK (ORCPT ); Sun, 25 Oct 2020 09:16:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1416220AbgJYNQI (ORCPT ); Sun, 25 Oct 2020 09:16:08 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD57BC0613CE for ; Sun, 25 Oct 2020 06:16:07 -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:Cc:To:From:Sender:Reply-To: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=mXCIbD64Gp3ZOJcmLwV6Yv6rNpKIA+dFP5RtkumGSlc=; b=J2lNaz9yih6cTzEOIMHMPd2bcv xlt6iIE65bDygcSA8ohtt76bafNHeXwNlSZ9WLg5sSbIEannoeQsXVLCRlBZM6lNjUzflop+feUXz o3M4gucYbYNvGyU3g3iFOk1U3uddd26HrtDjcH8my2cV7zXptn+pKD/qhvEI8sQURRBy93wwfe8fw 0jqHugMROCzX9JFsFEuC8gEYJ68uq3E86lkAUmqht2AR1sMURxbBTaxb5eQ30pAeRqxejqoCZYOOd 53w2ns5h5el5C3K5X9fqz0QqYBH8dyhaOcEq01mjWUc2QOXnRNf7nkvw68BQqUJd+IhZzwhFQ4bgM EhKSXZ2A==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsU-0001SE-6t; Sun, 25 Oct 2020 13:16:06 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 06/13] pknock: pknlusr: use macro to define inet_ntop buffer size. Date: Sun, 25 Oct 2020 13:15:52 +0000 Message-Id: <20201025131559.920038-8-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 POSIX provides a macro to define the minimum length required, so let's use it. Signed-off-by: Jeremy Sowden --- extensions/pknock/pknlusr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/pknock/pknlusr.c b/extensions/pknock/pknlusr.c index 252fd42ffecd..9f11250510a1 100644 --- a/extensions/pknock/pknlusr.c +++ b/extensions/pknock/pknlusr.c @@ -53,7 +53,7 @@ int main(void) while(1) { const char *ip; - char ipbuf[48]; + char ipbuf[INET_ADDRSTRLEN]; memset(nlmsg, 0, nlmsg_size); From patchwork Sun Oct 25 13:15:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387222 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=TpRAaIwy; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz4b6Cwcz9sVH for ; Mon, 26 Oct 2020 00:16:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416227AbgJYNQL (ORCPT ); Sun, 25 Oct 2020 09:16:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1416222AbgJYNQI (ORCPT ); Sun, 25 Oct 2020 09:16:08 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9058CC0613D0 for ; Sun, 25 Oct 2020 06:16:08 -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:Cc:To:From:Sender:Reply-To: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=IorB3Bawoq7KGt7P/xlTc5lZN6CaFrb32Ct0awhryMw=; b=TpRAaIwyMvJzIROc1Gn3yjTGXM 5FtBHDRXNdObD4kBOL6GO157mm7hg0UL0yU6RiDnQqJxpjQ/eZ4m9ppeLI79+jjB8Dw4lAiaz3bAh sEDy/YrhZDZWgFEv9/EqNjZgEDdYmRScabLC5kd2Byc7+TrZoXPcN7/J9y/ZP/ZruVQZVQOdko58C GkH9JZajPY+lQLNilpD8hoC5gmHX15K0k/+oXHdSXlXPvq7mtv0Qkju/c5bfV1TWpZCCwNphpqEje TjpSdphhngYztDr/VLIFteBNnHqslK8b9L2BzlgAAuhdtjTwHHWPp9DYeurkbCJan7b7v7QbxJxM0 YYCMAidg==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsU-0001SE-OA; Sun, 25 Oct 2020 13:16:07 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 07/13] pknock: pknlusr: don't treat recv return value of zero as an error. Date: Sun, 25 Oct 2020 13:15:53 +0000 Message-Id: <20201025131559.920038-9-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 A return-value of zero is not an error, so there's no point calling perror, but since we have not requested and don't expect a zero-length datagram, we treat it as EOF and exit. Signed-off-by: Jeremy Sowden --- extensions/pknock/pknlusr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extensions/pknock/pknlusr.c b/extensions/pknock/pknlusr.c index 9f11250510a1..2dd9ab7b9705 100644 --- a/extensions/pknock/pknlusr.c +++ b/extensions/pknock/pknlusr.c @@ -59,11 +59,14 @@ int main(void) status = recv(sock_fd, nlmsg, nlmsg_size, 0); - if (status <= 0) { + if (status < 0) { perror("recv()"); return 1; } + if (status == 0) + break; + cn_msg = NLMSG_DATA(nlmsg); pknock_msg = (struct xt_pknock_nl_msg *)(cn_msg->data); ip = inet_ntop(AF_INET, &pknock_msg->peer_ip, ipbuf, sizeof(ipbuf)); From patchwork Sun Oct 25 13:15:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387223 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=WO3vbzsi; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz4c4cf9z9sTq for ; Mon, 26 Oct 2020 00:16:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416228AbgJYNQM (ORCPT ); Sun, 25 Oct 2020 09:16:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1416212AbgJYNQJ (ORCPT ); Sun, 25 Oct 2020 09:16:09 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2974AC0613D2 for ; Sun, 25 Oct 2020 06:16:09 -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:Cc:To:From:Sender:Reply-To: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=qgFy+Evnm7VbdSynDf95DEMqILnuM8zlrZbF2ay8Jrs=; b=WO3vbzsi8oMIGfqlB87hhxIega BdCYsPY7xRdbl0YjH2XYcZFqtYp1gBQUKN+Sp2ywweBKHomz3sEME5OdFCuXOXlJwretyzxMhjVaq /0Q0plstZa2AXnnyV/aA38YQfhwV+EviQhgzmjKtV40GJkz/uh9lzrosWOvnQYrX1l7t44dFUcb9f Hphoruy9zuMj4GU25RWh1h4M1gGtA7OS1EkDjAyV11QPqXTsVElI0D8kKn7r4yMJRzYVs19giaohy wdlB7xmM0JpDJsnUP403X/bwmABi3ixuDi9t0owkax6+956lQ6fTZD3GYC2oVBRISumHkxLNJI7tG CHZh166Q==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsV-0001SE-FI; Sun, 25 Oct 2020 13:16:07 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 08/13] pknock: pknlusr: always close socket. Date: Sun, 25 Oct 2020 13:15:54 +0000 Message-Id: <20201025131559.920038-10-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 On some error paths the socket was not being closed before exit. Signed-off-by: Jeremy Sowden --- extensions/pknock/pknlusr.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/extensions/pknock/pknlusr.c b/extensions/pknock/pknlusr.c index 2dd9ab7b9705..fba628e1f466 100644 --- a/extensions/pknock/pknlusr.c +++ b/extensions/pknock/pknlusr.c @@ -29,7 +29,7 @@ int main(void) if (sock_fd == -1) { perror("socket()"); - return 1; + exit (EXIT_FAILURE); } local_addr.nl_groups = group; @@ -37,9 +37,8 @@ int main(void) status = bind(sock_fd, (struct sockaddr*)&local_addr, sizeof(local_addr)); if (status == -1) { - close(sock_fd); perror("bind()"); - return 1; + goto err_close_sock; } nlmsg_size = NLMSG_SPACE(sizeof(*cn_msg) + sizeof(*pknock_msg)); @@ -47,7 +46,7 @@ int main(void) if (!nlmsg) { perror("malloc()"); - return 1; + goto err_close_sock; } while(1) { @@ -61,7 +60,7 @@ int main(void) if (status < 0) { perror("recv()"); - return 1; + goto err_free_msg; } if (status == 0) @@ -74,9 +73,11 @@ int main(void) } - close(sock_fd); - +err_free_msg: free(nlmsg); - return 0; +err_close_sock: + close(sock_fd); + + exit (status == -1 ? EXIT_FAILURE : EXIT_SUCCESS); } From patchwork Sun Oct 25 13:15:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387231 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=CJD6FfMM; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz5w2Jy8z9sSG for ; Mon, 26 Oct 2020 00:17:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416236AbgJYNRY (ORCPT ); Sun, 25 Oct 2020 09:17:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2894311AbgJYNRX (ORCPT ); Sun, 25 Oct 2020 09:17:23 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34522C0613CE for ; Sun, 25 Oct 2020 06:17:23 -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:Cc:To:From:Sender:Reply-To: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=IYyh5vs68YaNUTYimxZm0quFKnVREld0VIcyP4xy0B0=; b=CJD6FfMMj/6A8dDD5woL1xWEZ5 YghXXjD2IjbDMc7J0Tah0EtHDzDYwMbbMku9H/jJW8mwMYw6i24O98gfzK048k7RMlqoUC/dUu413 xXqh8LXsNVrY34+tqMiYQjYopIwo0H03zSDqsWuFUUerw9YtxuQ/gZi7mZvacrl9xz6kDMd+g+8NC 8amRZLjgVc/3QX4x90zaBU3VARTAL0RF+E45VFrdnCnhk4t4r4usuP3iXEOH/T5vg7vY6G8g4s/hr e6DrTp+62IBn4ENdOJ+FewYYIZmG+69+nNSC8l4CbJzSKo37uTqABZLl+/mhTFTvHqH8OarbWo01k aH3/NO7w==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsW-0001SE-0V; Sun, 25 Oct 2020 13:16:08 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 09/13] pknock: pknlusr: fix hard-coded netlink multicast group ID. Date: Sun, 25 Oct 2020 13:15:55 +0000 Message-Id: <20201025131559.920038-11-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 The group ID used by xt_pknock is configurable, but pknlusr hard-codes it. Modify pknlusr to accept an optional ID from the command-line. Group ID's range from 1 to 32 and each ID appears in the group bit-mask at position `group_id - 1`. Signed-off-by: Jeremy Sowden --- extensions/pknock/pknlusr.c | 41 +++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/extensions/pknock/pknlusr.c b/extensions/pknock/pknlusr.c index fba628e1f466..255649aefbb5 100644 --- a/extensions/pknock/pknlusr.c +++ b/extensions/pknock/pknlusr.c @@ -7,15 +7,22 @@ #include #include #include +#include +#include +#include #include "xt_pknock.h" -#define GROUP 1 +#define DEFAULT_GROUP_ID 1 -int main(void) +#define MIN_GROUP_ID DEFAULT_GROUP_ID +#define MAX_GROUP_ID \ + (sizeof ((struct sockaddr_nl) { 0 }.nl_groups) * CHAR_BIT) + +int main(int argc, char **argv) { int status; - int group = GROUP; + unsigned int group_id = DEFAULT_GROUP_ID; struct sockaddr_nl local_addr = { .nl_family = AF_NETLINK }; int sock_fd; @@ -25,6 +32,32 @@ int main(void) struct cn_msg *cn_msg; struct xt_pknock_nl_msg *pknock_msg; + if (argc > 2) { + char *prog; + if (!(prog = strdup (argv[0]))) { + perror("strdup()"); + } else { + fprintf(stderr, "%s [ group-id ]\n", basename(prog)); + free(prog); + } + exit(EXIT_FAILURE); + } + + if (argc == 2) { + long n; + char *end; + + errno = 0; + n = strtol(argv[1], &end, 10); + if (*end || (errno && (n == LONG_MIN || n == LONG_MAX)) || + n < MIN_GROUP_ID || n > MAX_GROUP_ID) { + fputs("Group ID invalid.\n", stderr); + exit(EXIT_FAILURE); + } + + group_id = n; + } + sock_fd = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR); if (sock_fd == -1) { @@ -32,7 +65,7 @@ int main(void) exit (EXIT_FAILURE); } - local_addr.nl_groups = group; + local_addr.nl_groups = 1U << (group_id - 1); status = bind(sock_fd, (struct sockaddr*)&local_addr, sizeof(local_addr)); From patchwork Sun Oct 25 13:15:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387230 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=PWLSdH0+; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz5t0SMTz9sSG for ; Mon, 26 Oct 2020 00:17:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416234AbgJYNRV (ORCPT ); Sun, 25 Oct 2020 09:17:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2894311AbgJYNRV (ORCPT ); Sun, 25 Oct 2020 09:17:21 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14915C0613CE for ; Sun, 25 Oct 2020 06:17:21 -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:Cc:To:From:Sender:Reply-To: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=QCvr9eCrlqMIls1W+V4soEUo8q79TUK7H+mi1rhsHp0=; b=PWLSdH0+q+Kno/p3HlchIiuW0m U644J4sv7/44Sh3owxHgyJOt1LLn0PSke7bzAg7grLZfogd1t0xhvHiXXGM/aOoc4wou36SZrTsus fL6ZPCXvrj1HEjr7FbUsP4Lqw3FR54f9LZ26eQJK6VELndQRxGFsfDhTt/xTbf1bWWo/EGUt/Y+xV JkWTVjqr99DZfkUQJWo5thy/zkSzWjxLRQOWwwywpg4HeDq8uw80qa5yccQbpY8/EYV77xomuado8 rNQAAOS2oZ9unN1k2JbdD1RTJbAqzw0fUGz4a0rlkUKWs4FoUHSaACEeLRRx4MJt0cAeFNqB4FKCw szqlaW1w==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsW-0001SE-A8; Sun, 25 Oct 2020 13:16:08 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 10/13] pknock: xt_pknock: use IS_ENABLED. Date: Sun, 25 Oct 2020 13:15:56 +0000 Message-Id: <20201025131559.920038-12-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 It's more succinct than checking whether CONFIG_BLAH or CONFIG_BLAH_MODULE are defined. Signed-off-by: Jeremy Sowden --- extensions/pknock/xt_pknock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c index a9df420cc75e..ba8161517d27 100644 --- a/extensions/pknock/xt_pknock.c +++ b/extensions/pknock/xt_pknock.c @@ -677,7 +677,7 @@ static bool msg_to_userspace_nl(const struct xt_pknock_mtinfo *info, const struct peer *peer, int multicast_group) { -#if defined(CONFIG_CONNECTOR) || defined(CONFIG_CONNECTOR_MODULE) +#if IS_ENABLED(CONFIG_CONNECTOR) struct cn_msg *m; struct xt_pknock_nl_msg msg; @@ -1101,7 +1101,7 @@ static struct xt_match xt_pknock_mt_reg __read_mostly = { static int __init xt_pknock_mt_init(void) { -#if !defined(CONFIG_CONNECTOR) && !defined(CONFIG_CONNECTOR_MODULE) +#if !IS_ENABLED(CONFIG_CONNECTOR) if (nl_multicast_group != -1) pr_info("CONFIG_CONNECTOR not present; " "netlink messages disabled\n"); From patchwork Sun Oct 25 13:15:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387229 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=HOEjXrma; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz5r1YMDz9sSG for ; Mon, 26 Oct 2020 00:17:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416232AbgJYNRT (ORCPT ); Sun, 25 Oct 2020 09:17:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2894311AbgJYNRT (ORCPT ); Sun, 25 Oct 2020 09:17:19 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10001C0613CE for ; Sun, 25 Oct 2020 06:17:19 -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:Cc:To:From:Sender:Reply-To: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=wVsxldErMxXku4F2RABeggwkTqULGoXk/SfQXJli2Yo=; b=HOEjXrmah5IlxEW2Hhj4o1fol/ BcUYq9tVQiZGAQLyykUjeckSygNVQ6cVxoNLuqZjFmkMWc881ajUcmwL7UXaApd2t/Rp1FzigknlF ElrhkIZHOwlRffzwC1adrupA19hGvZ3VRoLjdz7iDhTk2cJx4IKD3RyZATEIUseNUsrLPw+QHPqyI h45IHzIDQg3exQDilLUKinazEpuiEjtTHXZmcMOk7aF/tl6U8FuRL+Jg0V/Py7ru4COX8CVaWdgYY bJOCOb09QRR0jIwyTXTM0v4o1uefkmmDCMcG5QXfl6VNAXsjiUAJeFiYUAKidfhW8UqtqZjrbj0KF MPyWu7gA==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsW-0001SE-K1; Sun, 25 Oct 2020 13:16:08 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 11/13] pknock: xt_pknock: use kzalloc. Date: Sun, 25 Oct 2020 13:15:57 +0000 Message-Id: <20201025131559.920038-13-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 some instances of kmalloc + memset. Signed-off-by: Jeremy Sowden --- extensions/pknock/xt_pknock.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c index ba8161517d27..ae3ab2445c3b 100644 --- a/extensions/pknock/xt_pknock.c +++ b/extensions/pknock/xt_pknock.c @@ -450,13 +450,12 @@ add_rule(struct xt_pknock_mtinfo *info) return true; } - rule = kmalloc(sizeof(*rule), GFP_KERNEL); + rule = kzalloc(sizeof(*rule), GFP_KERNEL); if (rule == NULL) return false; INIT_LIST_HEAD(&rule->head); - memset(rule->rule_name, 0, sizeof(rule->rule_name)); strncpy(rule->rule_name, info->rule_name, info->rule_name_len); rule->rule_name_len = info->rule_name_len; @@ -681,12 +680,9 @@ msg_to_userspace_nl(const struct xt_pknock_mtinfo *info, struct cn_msg *m; struct xt_pknock_nl_msg msg; - m = kmalloc(sizeof(*m) + sizeof(msg), GFP_ATOMIC); + m = kzalloc(sizeof(*m) + sizeof(msg), GFP_ATOMIC); if (m == NULL) return false; - - memset(m, 0, sizeof(*m) + sizeof(msg)); - m->seq = 0; m->len = sizeof(msg); msg.peer_ip = peer->ip; @@ -731,7 +727,7 @@ static bool has_secret(const unsigned char *secret, unsigned int secret_len, uint32_t ipsrc, const unsigned char *payload, unsigned int payload_len) { - char result[64]; // 64 bytes * 8 = 512 bits + char result[64] = ""; // 64 bytes * 8 = 512 bits char *hexresult; unsigned int hexa_size; int ret; @@ -752,13 +748,10 @@ has_secret(const unsigned char *secret, unsigned int secret_len, uint32_t ipsrc, if (payload_len != hexa_size + 1) return false; - hexresult = kmalloc(hexa_size, GFP_ATOMIC); + hexresult = kzalloc(hexa_size, GFP_ATOMIC); if (hexresult == NULL) return false; - memset(result, 0, sizeof(result)); - memset(hexresult, 0, hexa_size); - epoch_min = get_seconds() / 60; ret = crypto_shash_setkey(crypto.tfm, secret, secret_len); From patchwork Sun Oct 25 13:15:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387227 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=mk+AjLW2; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz5m6rVqz9sSG for ; Mon, 26 Oct 2020 00:17:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416170AbgJYNRQ (ORCPT ); Sun, 25 Oct 2020 09:17:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2894311AbgJYNRP (ORCPT ); Sun, 25 Oct 2020 09:17:15 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4FF2C0613CE for ; Sun, 25 Oct 2020 06:17:15 -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:Cc:To:From:Sender:Reply-To: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=oYxWxmTRcqbw4/TDfY63IlmNvhe0iiD5363WHpE0m2k=; b=mk+AjLW2qrdhOQsboSI21Bfmfe zQPs+81GUSmE3/5K0Ai8wfu2/eINLBvdev8bPc7BO312I+bCPFkrI2vjJ/rs6pJE2zrthH7bKD+vc QSdYgG+ZN9I0DRh0blFNk3ModSGZO7vzE8mzxf9sEtoju9DsmFAZt+xTK4ZSvBWS1Xbq4Z8I9H2cr xc3LOMxpUAKVVNGmxwGx7KVarwwC1OfC+JFpudP11IyFdjZxpF6Z8RUP9L5f9itNh/rzoXjpAPLqD +M3C47tjBJOTLt+tjaPOam89WPGSwHHFpE01UsfPmc6C8m4grvq3NDPrO+GpZ0n1GqClAzkyBB9TW 4gCJrdAw==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsW-0001SE-Td; Sun, 25 Oct 2020 13:16:09 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 12/13] pknock: xt_pknock: use `pr_err`. Date: Sun, 25 Oct 2020 13:15:58 +0000 Message-Id: <20201025131559.920038-14-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 some instances of `printk(KERN_ERR PKNOCK ...)`. We define `pr_fmt`, so `pr_err` is equivalent. Signed-off-by: Jeremy Sowden --- extensions/pknock/xt_pknock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c index ae3ab2445c3b..f2c79529e21b 100644 --- a/extensions/pknock/xt_pknock.c +++ b/extensions/pknock/xt_pknock.c @@ -1016,7 +1016,7 @@ out: return ret; } -#define RETURN_ERR(err) do { printk(KERN_ERR PKNOCK err); return -EINVAL; } while (false) +#define RETURN_ERR(err) do { pr_err(err); return -EINVAL; } while (false) static int pknock_mt_check(const struct xt_mtchk_param *par) { @@ -1103,14 +1103,14 @@ static int __init xt_pknock_mt_init(void) if (gc_expir_time < DEFAULT_GC_EXPIRATION_TIME) gc_expir_time = DEFAULT_GC_EXPIRATION_TIME; if (request_module(crypto.algo) < 0) { - printk(KERN_ERR PKNOCK "request_module('%s') error.\n", + pr_err("request_module('%s') error.\n", crypto.algo); return -ENXIO; } crypto.tfm = crypto_alloc_shash(crypto.algo, 0, 0); if (IS_ERR(crypto.tfm)) { - printk(KERN_ERR PKNOCK "failed to load transform for %s\n", + pr_err("failed to load transform for %s\n", crypto.algo); return PTR_ERR(crypto.tfm); } @@ -1120,7 +1120,7 @@ static int __init xt_pknock_mt_init(void) pde = proc_mkdir("xt_pknock", init_net.proc_net); if (pde == NULL) { - printk(KERN_ERR PKNOCK "proc_mkdir() error in _init().\n"); + pr_err("proc_mkdir() error in _init().\n"); return -ENXIO; } return xt_register_match(&xt_pknock_mt_reg); From patchwork Sun Oct 25 13:15:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1387228 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: 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=s3x5PIbN; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CJz5p2m8Cz9sSG for ; Mon, 26 Oct 2020 00:17:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416213AbgJYNRS (ORCPT ); Sun, 25 Oct 2020 09:17:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2894311AbgJYNRR (ORCPT ); Sun, 25 Oct 2020 09:17:17 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4194CC0613CE for ; Sun, 25 Oct 2020 06:17:17 -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:Cc:To:From:Sender:Reply-To: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=ddIkmwyIxuGA7rz9Dd+Wulfk5a4Zw05Tm7rJdZmVM6I=; b=s3x5PIbNcIQ2XqBbPgvNoYWNhH iI/FtJdg7xu8b+nrMK1yRnuit/WJ089Whb+gXlaQzE1xcRMdZPd8ZoK3OdR67NLeA+DFpxy19ZXHu apK7wLoZyRQOX5uYi820aWyACMl2uYGMleJDlmqh49g57pUB3jwCP2xyfckcRtl+vlXdZu/4EDZI+ 7XXsBzNIZFHH4KOS4mwFc8H3IqKr+uYQGE2n2uPSxEXk2IwPoO+g323GH6A+/dtkZY388yCCzSaPa iVFWxG37gLykpgh5drcO86F3OY8YWsnTCCxu3beff4Z8wRHet3VxOl0AF6CbegmbwAWjHAYti4vlz zae23JfA==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kWfsX-0001SE-5I; Sun, 25 Oct 2020 13:16:09 +0000 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH xtables-addons v2 13/13] pknock: xt_pknock: remove DEBUG definition and disable debug output. Date: Sun, 25 Oct 2020 13:15:59 +0000 Message-Id: <20201025131559.920038-15-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025131559.920038-1-jeremy@azazel.net> References: <20201025131559.920038-1-jeremy@azazel.net> MIME-Version: 1.0 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 The DEBUG definition in xt_pknock.h causes a compiler warning if one adds a DEBUG define to xt_pknock.c to enable pr_debug. Since it only controls some debugging output in libxt_pknock.c, it would make sense to move the definition there, but let's just disable the debugging instead. Signed-off-by: Jeremy Sowden --- extensions/pknock/libxt_pknock.c | 4 ++-- extensions/pknock/xt_pknock.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/extensions/pknock/libxt_pknock.c b/extensions/pknock/libxt_pknock.c index 4852e9f25a9e..1cd829333a1d 100644 --- a/extensions/pknock/libxt_pknock.c +++ b/extensions/pknock/libxt_pknock.c @@ -123,7 +123,7 @@ __pknock_parse(int c, char **argv, int invert, unsigned int *flags, info->ports_count = parse_ports(optarg, info->port, proto); info->option |= XT_PKNOCK_KNOCKPORT; *flags |= XT_PKNOCK_KNOCKPORT; -#if DEBUG +#ifdef DEBUG printf("ports_count: %d\n", info->ports_count); #endif break; @@ -162,7 +162,7 @@ __pknock_parse(int c, char **argv, int invert, unsigned int *flags, info->rule_name_len = strlen(info->rule_name); info->option |= XT_PKNOCK_NAME; *flags |= XT_PKNOCK_NAME; -#if DEBUG +#ifdef DEBUG printf("info->rule_name: %s\n", info->rule_name); #endif break; diff --git a/extensions/pknock/xt_pknock.h b/extensions/pknock/xt_pknock.h index d44905b44e0d..fb201df49e82 100644 --- a/extensions/pknock/xt_pknock.h +++ b/extensions/pknock/xt_pknock.h @@ -29,8 +29,6 @@ enum { XT_PKNOCK_MAX_PASSWD_LEN = 31, }; -#define DEBUG 1 - struct xt_pknock_mtinfo { char rule_name[XT_PKNOCK_MAX_BUF_LEN+1]; uint32_t rule_name_len;