Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1653663pxy; Mon, 2 Aug 2021 07:08:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1K+CgLHJi9IOa1M1RJdcgSIi7wPYgDJsmiLYlJu9Cvl958qQvGTH7g2TLzANrdD6ZTOjh X-Received: by 2002:aa7:cd5c:: with SMTP id v28mr19556555edw.305.1627913338907; Mon, 02 Aug 2021 07:08:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627913338; cv=none; d=google.com; s=arc-20160816; b=Q3PLmAGSc5tLy+C5NEbIuFBcT8pO08DywggGck90t7mEjk/Nuwg87fZfsFycDfrSEH /haCDjcXgGXQ4frqskYwU5Ufw+9NSk2ygX+IoOU+LOVkLKOxnCzutg5KPhRlHv3zP2m5 Pd+SbQaI/XrZMNBAWUgdlenDgTp92BEGYudqXJkN1d9UEdy3PfzM+eeXUkkiZaGWUE9n w1Iv1XIU+feY60AZO0hW0e99msn7m9HYSrbFmEsATco/z2+c3A9MfaU5tDEQYC1mbwoj pVmYGQ2KqIQ2djeDnwQV0zWZ4S//brL4NGN4vtp58yYWkOO+qMehi22jFfV3WKeCvfW3 UAWw== 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=jLNv29JFcd4Vvfb/WSpVo4qXNaVYLFeyCdaUi6kgsp0=; b=g24oxMf32hZslFhQ+bxh+80hAzE1gKx9rCooy/k9iXymuWEe5NsUVn8oSL/YSOB8wo 26VWxnBgU+MFOszcoHkKN041TZR7BnKiIcQIdidFW4CHIk3HBCL8Ki6caiFo9McZ+MbN WJlM834pcFoFA4q82sv70S+zRgA1R9Ruqun501O8t9u1OTsnWA6pEgu3ffqUuSm9YxOM x0AO0aJrAObYbJju4FDj1mhCcbCcLrhFIsdXESsytCha2NHXEd7eTNB0S27w9u+wNV0D DJ805AsW5XfIpvYPuRyEgPWGynbf209V9LIEWZH7vnc1a7AqVE6gQvBHWw5Mg1X2+bqA Z2dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uysZ01cs; 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 h12si10159409ejy.369.2021.08.02.07.08.33; Mon, 02 Aug 2021 07:08:58 -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=uysZ01cs; 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 S236487AbhHBOGL (ORCPT + 99 others); Mon, 2 Aug 2021 10:06:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:43028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236592AbhHBN7p (ORCPT ); Mon, 2 Aug 2021 09:59:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8EE486113D; Mon, 2 Aug 2021 13:55:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627912555; bh=5j7qW1QDc9cb8oLFv3IHKytcCPufOrNjkEtox/G9Hho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uysZ01csHn7mvyA7w1PG5wL+7gJMsbLAeL3rT4vUG00xSx1SoEW63Q5apgTgvHuAD uAPSzn9G7aDu7Tlq9sfyhQUKszklVf9QTqPV/PzRX3tab/XpZ7xNCRcDbp9yEHgR3c oCm28Kl6zxyMXcBk/rIswjOMyhvH8a5qUCV7/o9w= 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 5.13 044/104] netfilter: nft_nat: allow to specify layer 4 protocol NAT only Date: Mon, 2 Aug 2021 15:44:41 +0200 Message-Id: <20210802134345.477988060@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210802134344.028226640@linuxfoundation.org> References: <20210802134344.028226640@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 0840c635b752..be1595d6979d 100644 --- a/net/netfilter/nft_nat.c +++ b/net/netfilter/nft_nat.c @@ -201,7 +201,9 @@ static int nft_nat_init(const struct nft_ctx *ctx, const struct nft_expr *expr, alen = sizeof_field(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