public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: gregkh@linuxfoundation.org, stable@vger.kernel.org, sashal@kernel.org
Subject: [PATCH -stable,4.14 00/11] more stable fixes for 4.14
Date: Sat, 27 May 2023 18:08:00 +0200	[thread overview]
Message-ID: <20230527160811.67779-1-pablo@netfilter.org> (raw)

Hi Greg, Sasha,

[ This is v2 including two initial missing backport patches and one new
  patch at the end of this batch. ]

This is second round of -stable backport fixes for 4.14. This batch
includes dependency patches which are not currently in the 4.14 branch.

The following list shows the backported patches, I am using original
commit IDs for reference:

1) 4f16d25c68ec ("netfilter: nftables: add nft_parse_register_load() and use it")

2) 345023b0db31 ("netfilter: nftables: add nft_parse_register_store() and use it")

3) 08a01c11a5bb ("netfilter: nftables: statify nft_parse_register()")

4) 6e1acfa387b9 ("netfilter: nf_tables: validate registers coming from userspace.")

5) 20a1452c3542 ("netfilter: nf_tables: add nft_setelem_parse_key()")

6) fdb9c405e35b ("netfilter: nf_tables: allow up to 64 bytes in the set element data area")

7) 7e6bc1f6cabc ("netfilter: nf_tables: stricter validation of element data")

8) 215a31f19ded ("netfilter: nft_dynset: do not reject set updates with NFT_SET_EVAL")

9) 36d5b2913219 ("netfilter: nf_tables: do not allow RULE_ID to refer to another chain")

10) 470ee20e069a ("netfilter: nf_tables: do not allow SET_ID to refer to another table")

11) d209df3e7f70 ("netfilter: nf_tables: fix register ordering")

Please, apply.
Thanks.

Florian Westphal (1):
  netfilter: nf_tables: fix register ordering

Pablo Neira Ayuso (10):
  netfilter: nftables: add nft_parse_register_load() and use it
  netfilter: nftables: add nft_parse_register_store() and use it
  netfilter: nftables: statify nft_parse_register()
  netfilter: nf_tables: validate registers coming from userspace.
  netfilter: nf_tables: add nft_setelem_parse_key()
  netfilter: nf_tables: allow up to 64 bytes in the set element data area
  netfilter: nf_tables: stricter validation of element data
  netfilter: nft_dynset: do not reject set updates with NFT_SET_EVAL
  netfilter: nf_tables: do not allow RULE_ID to refer to another chain
  netfilter: nf_tables: do not allow SET_ID to refer to another table

 include/net/netfilter/nf_tables.h        |  17 +-
 include/net/netfilter/nf_tables_core.h   |  14 +-
 include/net/netfilter/nft_fib.h          |   2 +-
 include/net/netfilter/nft_masq.h         |   4 +-
 include/net/netfilter/nft_meta.h         |   4 +-
 include/net/netfilter/nft_redir.h        |   4 +-
 include/uapi/linux/netfilter/nf_tables.h |   2 +-
 net/bridge/netfilter/nft_meta_bridge.c   |   5 +-
 net/ipv4/netfilter/nft_dup_ipv4.c        |  18 +-
 net/ipv6/netfilter/nft_dup_ipv6.c        |  18 +-
 net/netfilter/nf_tables_api.c            | 220 +++++++++++++++--------
 net/netfilter/nft_bitwise.c              |  14 +-
 net/netfilter/nft_byteorder.c            |  14 +-
 net/netfilter/nft_cmp.c                  |   8 +-
 net/netfilter/nft_ct.c                   |  12 +-
 net/netfilter/nft_dup_netdev.c           |   6 +-
 net/netfilter/nft_dynset.c               |  16 +-
 net/netfilter/nft_exthdr.c               |  14 +-
 net/netfilter/nft_fib.c                  |   5 +-
 net/netfilter/nft_fwd_netdev.c           |   6 +-
 net/netfilter/nft_hash.c                 |  25 ++-
 net/netfilter/nft_immediate.c            |   8 +-
 net/netfilter/nft_lookup.c               |  14 +-
 net/netfilter/nft_masq.c                 |  14 +-
 net/netfilter/nft_meta.c                 |   8 +-
 net/netfilter/nft_nat.c                  |  35 ++--
 net/netfilter/nft_numgen.c               |  15 +-
 net/netfilter/nft_objref.c               |   6 +-
 net/netfilter/nft_payload.c              |  10 +-
 net/netfilter/nft_queue.c                |  12 +-
 net/netfilter/nft_range.c                |   6 +-
 net/netfilter/nft_redir.c                |  14 +-
 net/netfilter/nft_rt.c                   |   7 +-
 33 files changed, 320 insertions(+), 257 deletions(-)

-- 
2.30.2


             reply	other threads:[~2023-05-27 15:08 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-27 16:08 Pablo Neira Ayuso [this message]
2023-05-27 16:08 ` [PATCH -stable,4.14 01/11] netfilter: nftables: add nft_parse_register_load() and use it Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 02/11] netfilter: nftables: add nft_parse_register_store() " Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 03/11] netfilter: nftables: statify nft_parse_register() Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 04/11] netfilter: nf_tables: validate registers coming from userspace Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 05/11] netfilter: nf_tables: add nft_setelem_parse_key() Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 06/11] netfilter: nf_tables: allow up to 64 bytes in the set element data area Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 07/11] netfilter: nf_tables: stricter validation of element data Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 08/11] netfilter: nft_dynset: do not reject set updates with NFT_SET_EVAL Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 09/11] netfilter: nf_tables: do not allow RULE_ID to refer to another chain Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 10/11] netfilter: nf_tables: do not allow SET_ID to refer to another table Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 11/11] netfilter: nf_tables: fix register ordering Pablo Neira Ayuso
2023-05-28  7:36 ` [PATCH -stable,4.14 00/11] more stable fixes for 4.14 Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230527160811.67779-1-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox