Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp1084102ybl; Wed, 14 Aug 2019 10:26:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqxtVg9gMyS1o1IDJAP9ZrRqpr3yLjfiUDrzO+oZu3AZHY7hyCFR1RbzjV+962KPcgKvu17B X-Received: by 2002:a62:7e11:: with SMTP id z17mr994158pfc.211.1565803572676; Wed, 14 Aug 2019 10:26:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565803572; cv=none; d=google.com; s=arc-20160816; b=l6jSsyruGCHUY8wRO+OTLO2Ah8V2+D2aOgTgyDGekdWQqVH+0kZyo2ukUT1nY9nBdg gxiQLC8XFKfDYs0oN4sslcTMmwXcEiBfbodaoVlMoPL48zzoub9U9YIB2l54Yhyp5Syx dxpxeahqEY2mPcFHBqF73b5Im3xyd/geIgOY1IMYhIHZDTuuM9MHISCKT3lOGTu0IwZh NKI15w2HQlJumsgv5NYJoGDwyHbWAahZ0xKJWvgaw1dG3I4YufmjYZfidGMElEXZAYiY 0RiZ0YQhD7/LHOEdOtatInMh84TGtrmJyN8+yL6F+IrLzkRcDX5F1c4uwl5h4iFnpRcZ SXrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5WlFNuHcKSYkjHIurfb449qOCWOo/pdruCKs8iK3Srw=; b=Y8hcMeDdKhYTmFo0Q7Wsquq7kSIoUVoV+hse+tW4aFBEUT9nFdu9sAYEZwm/v6SSW/ wzBp978DtrJpNDT+NQPcId+Pj7B/0PAz3veTJCcvDEpz3AmyW5QszvO9awnCMEgexj1H qqNMoW2QHA3IwVwtim7hBbCpUMHzNuAgtqvsyj94t+DsJ+FtWUEtfhWDz1HG++O6BE5/ aTBD1PZlem/I6t6SkgTMUHiVM3K4GoUW8Plv2JJdTIRbPIsd75xjpnvnru2stWUAVsXp ebCHEtRvUoWFovr8tcsVK6r6rh58KaD7UbeIg8KMb/qlBaUn2RqM1zzNBfRv7BDp4Md/ ZXQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eS8hyGzI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v185si207064pgd.340.2019.08.14.10.25.56; Wed, 14 Aug 2019 10:26:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eS8hyGzI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728675AbfHNRFu (ORCPT + 99 others); Wed, 14 Aug 2019 13:05:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:54776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728979AbfHNRFs (ORCPT ); Wed, 14 Aug 2019 13:05:48 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A2AE12084D; Wed, 14 Aug 2019 17:05:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802348; bh=IW/FH2Ge38FoPwIKam244A3ofR5WOVQDwGpmI/So+Wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eS8hyGzIW3SNeGVxZWs4k2QLsMbvlC1mo3wcRH5HUu08+GfKN5MvH+OB4hqGoT2Os xGX7GWrD0iH/WsZRVqyY63Yeb6jPY7SnUZhShA3JI737nFH7+vDVXWIrkbvvElxJQU lkNodEgHHlJos6INMSDwMuYE32nZZGM0SWAfXNpg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Phil Sutter , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.2 063/144] netfilter: nf_tables: Support auto-loading for inet nat Date: Wed, 14 Aug 2019 19:00:19 +0200 Message-Id: <20190814165802.474880431@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165759.466811854@linuxfoundation.org> References: <20190814165759.466811854@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit b4f1483cbfa5fafca4874e90063f75603edbc210 ] Trying to create an inet family nat chain would not cause nft_chain_nat.ko module to auto-load due to missing module alias. Add a proper one with hard-coded family value 1 for the pseudo-family NFPROTO_INET. Fixes: d164385ec572 ("netfilter: nat: add inet family nat support") Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nft_chain_nat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/netfilter/nft_chain_nat.c b/net/netfilter/nft_chain_nat.c index 2f89bde3c61cb..ff9ac8ae0031f 100644 --- a/net/netfilter/nft_chain_nat.c +++ b/net/netfilter/nft_chain_nat.c @@ -142,3 +142,6 @@ MODULE_ALIAS_NFT_CHAIN(AF_INET, "nat"); #ifdef CONFIG_NF_TABLES_IPV6 MODULE_ALIAS_NFT_CHAIN(AF_INET6, "nat"); #endif +#ifdef CONFIG_NF_TABLES_INET +MODULE_ALIAS_NFT_CHAIN(1, "nat"); /* NFPROTO_INET */ +#endif -- 2.20.1