From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E40878B4F; Wed, 21 Feb 2024 13:43:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708523026; cv=none; b=REkw3oFCohNINpTSn1Mqz87okfkuPMoNOah486f1tkaEBw1RaGTRpqs9ULBYiDD+Cm/TicogxMIZu6sxKb/Jc3tPdNHn73UzzNbklkYhHDhrIpE4sINJsQDTho9WvsmFWTQ1oA1o1iqR17DUpcSWoH1urZ9SaDN1kR190JkqVOw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708523026; c=relaxed/simple; bh=g9OLVsVKXRFTtr2GvLDHlVCxP0zSvVAuMoNYdrorqOI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Uy6MUh3Uvrl7zEh0I53ARpq+aSCcVI9o4XiSmPAIz2BEcVi2+I9U3uTFFQOmLEQ4N5bRNGud87Y/9VHV+Hhq8PWqmOxPoFUK2dKvAVJUdQ9b/7YyV/OfO9kD2j95m+y+Lxt+B1JuFzN2lLcRcoGGncyrjlMf/2qO9hf9+fAq+Ns= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Do/4vIsE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Do/4vIsE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3F67C43390; Wed, 21 Feb 2024 13:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708523026; bh=g9OLVsVKXRFTtr2GvLDHlVCxP0zSvVAuMoNYdrorqOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Do/4vIsEmSrkZFW1IWPYdlBn+syfl8datOFBgNhVUxLfZSZkreaBaHVwVoRSe5FI+ xwAaKyJKrBg1g+SwVEjnRLzRhWnXkQm6M1Tf1C1Ga8t6oC4IV7P/g1bjC5dwaNOGuK PTE0Nu+7xZhV9WlOttlPIvpyRsZU1kKFIuX7DWYQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.15 318/476] netfilter: nft_compat: reject unused compat flag Date: Wed, 21 Feb 2024 14:06:09 +0100 Message-ID: <20240221130019.777084142@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221130007.738356493@linuxfoundation.org> References: <20240221130007.738356493@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pablo Neira Ayuso [ Upstream commit 292781c3c5485ce33bd22b2ef1b2bed709b4d672 ] Flag (1 << 0) is ignored is set, never used, reject it it with EINVAL instead. Fixes: 0ca743a55991 ("netfilter: nf_tables: add compatibility layer for x_tables") Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/netfilter/nft_compat.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index 07871c8a0601..62cc780a168a 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -266,9 +266,11 @@ enum nft_rule_attributes { /** * enum nft_rule_compat_flags - nf_tables rule compat flags * + * @NFT_RULE_COMPAT_F_UNUSED: unused * @NFT_RULE_COMPAT_F_INV: invert the check result */ enum nft_rule_compat_flags { + NFT_RULE_COMPAT_F_UNUSED = (1 << 0), NFT_RULE_COMPAT_F_INV = (1 << 1), NFT_RULE_COMPAT_F_MASK = NFT_RULE_COMPAT_F_INV, }; diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c index 3fb8d7fb21af..4ef664a2bbe6 100644 --- a/net/netfilter/nft_compat.c +++ b/net/netfilter/nft_compat.c @@ -212,7 +212,8 @@ static int nft_parse_compat(const struct nlattr *attr, u16 *proto, bool *inv) return -EINVAL; flags = ntohl(nla_get_be32(tb[NFTA_RULE_COMPAT_FLAGS])); - if (flags & ~NFT_RULE_COMPAT_F_MASK) + if (flags & NFT_RULE_COMPAT_F_UNUSED || + flags & ~NFT_RULE_COMPAT_F_MASK) return -EINVAL; if (flags & NFT_RULE_COMPAT_F_INV) *inv = true; -- 2.43.0