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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A9BBC2BB86 for ; Sat, 11 Apr 2020 23:41:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2BD6E206E9 for ; Sat, 11 Apr 2020 23:41:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586648484; bh=AteEPKEmTxb6IvEHpeF+RDvEo930PxsTukXeAY8tpqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=z8pnFNugja9RNc261sA2vszFzGxpQqF3mmGbV2v4JRnJz0XtOvX9cjfAatq2XXBNf bx4h7Psem8FZGvwUd0B/yqo5/UB6VvlTTG1DQFrNYO2F6NqDW/1PXLZMA+Fd8ow6Wn pPew/GbNdaQv5VkdYp3bJl7ds26vT8ZWP+54ET5o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729162AbgDKXlW (ORCPT ); Sat, 11 Apr 2020 19:41:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:42830 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727411AbgDKXHJ (ORCPT ); Sat, 11 Apr 2020 19:07:09 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9F7B6216FD; Sat, 11 Apr 2020 23:07:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646429; bh=AteEPKEmTxb6IvEHpeF+RDvEo930PxsTukXeAY8tpqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qF28fhDV4fxlNq4hMlQAPDvYda2xNBuWPxhGse6jaFRTghddWhrq94QYT6L+LMsYo kGuJYwifBaOs6/OnHapkaw2zW7+oaFNCbKibq4Onfz1v3B8+qsud3CSwt8oEqP9Dgf h5cJzhehDc3WuOnI5Rw2pUW2Vwj5Gyt5NY6PFf5M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Romain Bellan , Florent Fourcot , Pablo Neira Ayuso , Sasha Levin , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.5 002/121] netfilter: ctnetlink: be more strict when NF_CONNTRACK_MARK is not set Date: Sat, 11 Apr 2020 19:05:07 -0400 Message-Id: <20200411230706.23855-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411230706.23855-1-sashal@kernel.org> References: <20200411230706.23855-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Romain Bellan [ Upstream commit 7c6b4121627aeaa79536fbb900feafec740410d3 ] When CONFIG_NF_CONNTRACK_MARK is not set, any CTA_MARK or CTA_MARK_MASK in netlink message are not supported. We should return an error when one of them is set, not both Fixes: 9306425b70bf ("netfilter: ctnetlink: must check mark attributes vs NULL") Signed-off-by: Romain Bellan Signed-off-by: Florent Fourcot Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 6a1c8f1f61718..7f5258ae1218a 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -860,7 +860,7 @@ ctnetlink_alloc_filter(const struct nlattr * const cda[], u8 family) struct ctnetlink_filter *filter; #ifndef CONFIG_NF_CONNTRACK_MARK - if (cda[CTA_MARK] && cda[CTA_MARK_MASK]) + if (cda[CTA_MARK] || cda[CTA_MARK_MASK]) return ERR_PTR(-EOPNOTSUPP); #endif -- 2.20.1