From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:38697 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752303AbbJQTsv (ORCPT ); Sat, 17 Oct 2015 15:48:51 -0400 Subject: Patch "netfilter: nf_tables: Use 32 bit addressing register from nft_type_to_reg()" has been added to the 4.1-stable tree To: pablo@netfilter.org, aschultz@tpip.net, gregkh@linuxfoundation.org Cc: , From: Date: Sat, 17 Oct 2015 12:48:49 -0700 Message-ID: <14451113295590@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled netfilter: nf_tables: Use 32 bit addressing register from nft_type_to_reg() to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: netfilter-nf_tables-use-32-bit-addressing-register-from-nft_type_to_reg.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From bf798657eb5ba57552096843c315f096fdf9b715 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 12 Aug 2015 17:41:00 +0200 Subject: netfilter: nf_tables: Use 32 bit addressing register from nft_type_to_reg() From: Pablo Neira Ayuso commit bf798657eb5ba57552096843c315f096fdf9b715 upstream. nft_type_to_reg() needs to return the register in the new 32 bit addressing, otherwise we hit EINVAL when using mappings. Fixes: 49499c3 ("netfilter: nf_tables: switch registers to 32 bit addressing") Reported-by: Andreas Schultz Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- include/net/netfilter/nf_tables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h @@ -125,7 +125,7 @@ static inline enum nft_data_types nft_dr static inline enum nft_registers nft_type_to_reg(enum nft_data_types type) { - return type == NFT_DATA_VERDICT ? NFT_REG_VERDICT : NFT_REG_1; + return type == NFT_DATA_VERDICT ? NFT_REG_VERDICT : NFT_REG_1 * NFT_REG_SIZE / NFT_REG32_SIZE; } unsigned int nft_parse_register(const struct nlattr *attr); Patches currently in stable-queue which might be from pablo@netfilter.org are queue-4.1/netfilter-nft_compat-skip-family-comparison-in-case-of-nfproto_unspec.patch queue-4.1/netfilter-nf_conntrack-support-expectations-in-different-zones.patch queue-4.1/netfilter-nf_log-wait-for-rcu-grace-after-logger-unregistration.patch queue-4.1/netfilter-nftables-do-not-run-chains-in-the-wrong-network-namespace.patch queue-4.1/netfilter-ctnetlink-put-back-references-to-master-ct-and-expect-objects.patch queue-4.1/netfilter-nfnetlink-work-around-wrong-endianess-in-res_id-field.patch queue-4.1/netfilter-nf_log-don-t-zap-all-loggers-on-unregister.patch queue-4.1/netfilter-nf_tables-use-32-bit-addressing-register-from-nft_type_to_reg.patch