Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1643693pxy; Mon, 2 Aug 2021 06:58:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIqrnjLVKocKgniMCGKqSUBS4O+DmXukLBj7PuZyQ4YNQSQ2IUVRSO/qSNHWq2Q6tZnab2 X-Received: by 2002:a92:1942:: with SMTP id e2mr588543ilm.4.1627912703244; Mon, 02 Aug 2021 06:58:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627912703; cv=none; d=google.com; s=arc-20160816; b=N/hIVMsWV6BIFSg03VXvBbeC873WIJVyng81aWAVXABqfBALHp4zjPy4UfhQkQ9XO9 LU1aUnJhFk7kCTQ0uxm66XdWALuFRLPF32EgabnpVtkifJPRZqVGmUsCrLuF0levcgP1 v/CrvL3FGJHWhceWtZazvG4I2iyKnlyDKQ2UfHF1r63AmubiFnHnlYLbSajtoKDo3fJy Zvgddp+RVRPdYhI1InRQsGQ56YUc23P9AXxtLz1llYhmTxb9AoMxawZmKHwp/r4U91Ug F/QNpQ6Y6QQTHNOmj9fObPQmGcg5a7GyyzWmPxULebhWHuqRsoM7Mfp48hDbQwCr+78i oodA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hcj4dZ7hGLj0IL+dkAwCCgWSaBJ0t3z6gYeIx8PkG6g=; b=eFexco4ZpqWfWGGYZ2fq+tTa1EQ11A6++m8OKLkXvmq0/I1bnnCvUdyHwwYd5Ml+Zv UPb4Nb/9WR4kfkw+8ccaACSnzqh34345fPJRuxzmdbNh9KZW3PMFEUnuefx9R6/iS8Ci lQt0v8KYFyIGE6rWA/HjRg9ZiRR+P4/8vqdBZh6IFfFcnpF7BdfQ4m0yzJcRFfr0Xx+a S++XLakz/9S29xxDjuO+WOIbN5p/XZi5WOH8NH2WILD9KsIQVY6pW/hMl+H1uHdXHsuG TZjNG/NmQCB/yTmvOJLfS3Y3i21K0f+5dW0X4lftKk5/MUlQ9N2US+Bj+zhe5RbBnl2E gfpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hrRr1Wh5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w3si6316200ilg.140.2021.08.02.06.58.11; Mon, 02 Aug 2021 06:58:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hrRr1Wh5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235806AbhHBN4V (ORCPT + 99 others); Mon, 2 Aug 2021 09:56:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:33468 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234082AbhHBNuv (ORCPT ); Mon, 2 Aug 2021 09:50:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 14D6F60551; Mon, 2 Aug 2021 13:50:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627912232; bh=Mam1UM8UmtPq2nCijs9e2IQ42RQzEvBrk8pNHcOid1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hrRr1Wh59mHm5iyTiCc8V56sfV8K3Go04A4pDBCA/Ag4IXwMekiRItzfFLrDggVsT ni54IzwW/p08isjEaZQq1wYJ1zDardsWD74Y8MUOohMb7hkheJ7+EnJALLr5DRn5BV wOFWieckY3IaFCKpDLkJH1YPPypHaDxKpQ13oczY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 4.19 17/30] netfilter: nft_nat: allow to specify layer 4 protocol NAT only Date: Mon, 2 Aug 2021 15:44:55 +0200 Message-Id: <20210802134334.622123918@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210802134334.081433902@linuxfoundation.org> References: <20210802134334.081433902@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pablo Neira Ayuso [ Upstream commit a33f387ecd5aafae514095c2c4a8c24f7aea7e8b ] nft_nat reports a bogus EAFNOSUPPORT if no layer 3 information is specified. Fixes: d07db9884a5f ("netfilter: nf_tables: introduce nft_validate_register_load()") Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nft_nat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nft_nat.c b/net/netfilter/nft_nat.c index 3e82a7d0df2a..2c3d7ff6f58a 100644 --- a/net/netfilter/nft_nat.c +++ b/net/netfilter/nft_nat.c @@ -153,7 +153,9 @@ static int nft_nat_init(const struct nft_ctx *ctx, const struct nft_expr *expr, alen = FIELD_SIZEOF(struct nf_nat_range, min_addr.ip6); break; default: - return -EAFNOSUPPORT; + if (tb[NFTA_NAT_REG_ADDR_MIN]) + return -EAFNOSUPPORT; + break; } priv->family = family; -- 2.30.2