From patchwork Wed Dec 14 21:35:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: joseph.j.conley@gmail.com X-Patchwork-Id: 705790 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tf91814QRz9srZ for ; Thu, 15 Dec 2016 08:38:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u2YQa6Vv"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753935AbcLNViT (ORCPT ); Wed, 14 Dec 2016 16:38:19 -0500 Received: from mail-io0-f195.google.com ([209.85.223.195]:33699 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752925AbcLNViS (ORCPT ); Wed, 14 Dec 2016 16:38:18 -0500 Received: by mail-io0-f195.google.com with SMTP id p13so6410598ioi.0 for ; Wed, 14 Dec 2016 13:38:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=cClyGc+Zixafvrx0+IyFPVPInq1047oX7Ovy18mIGu8=; b=u2YQa6VvpMaVRjiNeW/8Q7S8553UkhuWv9cXVogmJNISOauKvhMM/A+7DMpnM/uGM3 pbwhSbNuFoLD0ZaCy9C0QQ3xUKiEkp2zA4luq4TuAc2T3r5eD+bfhbHtCFuA1hM4XtSe 5ieLqcgYsv4SIYfpJgt7fn7aDAV0PJO2UjN33JcRpnwk8h3CYWPnjSUmX3RfzF74j+Vf +rDF+6rg1IDG0KtA3qtev/eyGvdYV1DHzqzQLxEsYf2Zy9VOq6BaklYk9ExppLVgTFft PHLIIjEbnjRaIQbMUelyXigAV0BsR9ARwB3BO4SjsKP5xIDbkgMYBCSUTdt5cszTlkSw 3wRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=cClyGc+Zixafvrx0+IyFPVPInq1047oX7Ovy18mIGu8=; b=jhJ7ldZgqy6GdOTfcCimRTanfBkQ8ugKuqwc5ZnFBt2x4lz6NJ8OWnCGyLqlZomhsM v7pfPj1iu03ArNumNyFsUApJ990SQGWdSMyctwKO3FOu0yq9v94Xrox+5HDbDUaI+tDu 0FcSsoecq6yam0JQHh9o+I41N93pOfmRJ/V5mywYCMhnR8nFw6WCP+n8mDxxwhTzfLZ8 ZdyygKr0byT0K+Fy3x625BlvBCCf1H1rglZV+4PsqiuDeJNAOx7UrSMUTFcJ55JyHTNz iE/wux+srZ0glR2bzRDDK+KHVJw7vvNVk/b4JiBSTdXoRBmX2eeV7HrdOuJAPjkmIfcb 8Duw== X-Gm-Message-State: AKaTC01Bz5z6r9RXIEMU7I3Rw8YsQKde/ETCXUKI3hLcVEDbI2yf05/p7ZLr+17XXfDQ2A== X-Received: by 10.107.145.69 with SMTP id t66mr92540215iod.203.1481751497534; Wed, 14 Dec 2016 13:38:17 -0800 (PST) Received: from joecon-T3610.corp.lairdtech.com ([12.219.245.219]) by smtp.googlemail.com with ESMTPSA id w189sm3152955ith.19.2016.12.14.13.38.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Dec 2016 13:38:17 -0800 (PST) From: joseph.j.conley@gmail.com To: netfilter-devel@vger.kernel.org Cc: Joe Conley Subject: [PATCH] netfilter: conntrack: Fix ifdef checks for CONFIG_NF_CONNTRACK_MARK Date: Wed, 14 Dec 2016 16:35:57 -0500 Message-Id: <1481751357-22893-1-git-send-email-joseph.j.conley@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Joe Conley Two missing ifdef checks for CONFIG_NF_CONNTRACK_MARK were causing EOPNOTSUPP to be returned. Every single place that cda[CTA_MARK] or cda[CTA_MARK_MASK] was checked was inside a #ifdef for CONFIG_NF_CONNTRACK_MARK except for these two places. The reason for this change stems from this commit: 866476f323465a8afef10b14b48d5136bf5c51fe (netfilter: conntrack: Flush connections with a given mark) This allows conntrack -L to be ran succesfully when CONFIG_NF_CONNTRACK_MARK is not enabled. Signed-off-by: Joe Conley --- net/netfilter/nf_conntrack_netlink.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 2754045..94146bd 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -1107,13 +1107,13 @@ static int ctnetlink_flush_conntrack(struct net *net, u32 portid, int report) { struct ctnetlink_filter *filter = NULL; - +#ifdef CONFIG_NF_CONNTRACK_MARK if (cda[CTA_MARK] && cda[CTA_MARK_MASK]) { filter = ctnetlink_alloc_filter(cda); if (IS_ERR(filter)) return PTR_ERR(filter); } - +#endif nf_ct_iterate_cleanup(net, ctnetlink_filter_match, filter, portid, report); kfree(filter); @@ -1192,7 +1192,7 @@ static int ctnetlink_get_conntrack(struct net *net, struct sock *ctnl, .dump = ctnetlink_dump_table, .done = ctnetlink_done, }; - +#ifdef CONFIG_NF_CONNTRACK_MARK if (cda[CTA_MARK] && cda[CTA_MARK_MASK]) { struct ctnetlink_filter *filter; @@ -1202,6 +1202,7 @@ static int ctnetlink_get_conntrack(struct net *net, struct sock *ctnl, c.data = filter; } +#endif return netlink_dump_start(ctnl, skb, nlh, &c); }