4.19-stable patches

added patches:
	aio-fix-mremap-after-fork-null-deref.patch
	netfilter-nft_tproxy-restrict-to-prerouting-hook.patch

diff --git a/queue-4.19/aio-fix-mremap-after-fork-null-deref.patch b/queue-4.19/aio-fix-mremap-after-fork-null-deref.patch
new file mode 100644 (file)
index 0000000..549950a
--- /dev/null
+++ b/queue-4.19/aio-fix-mremap-after-fork-null-deref.patch
@@ -0,0 +1,49 @@
+From 81e9d6f8647650a7bead74c5f926e29970e834d1 Mon Sep 17 00:00:00 2001
+From: Seth Jenkins <sethjenkins@google.com>
+Date: Tue, 31 Jan 2023 12:25:55 -0500
+Subject: aio: fix mremap after fork null-deref
+
+From: Seth Jenkins <sethjenkins@google.com>
+
+commit 81e9d6f8647650a7bead74c5f926e29970e834d1 upstream.
+
+Commit e4a0d3e720e7 ("aio: Make it possible to remap aio ring") introduced
+a null-deref if mremap is called on an old aio mapping after fork as
+mm->ioctx_table will be set to NULL.
+
+[jmoyer@redhat.com: fix 80 column issue]
+Link: https://lkml.kernel.org/r/x49sffq4nvg.fsf@segfault.boston.devel.redhat.com
+Fixes: e4a0d3e720e7 ("aio: Make it possible to remap aio ring")
+Signed-off-by: Seth Jenkins <sethjenkins@google.com>
+Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
+Cc: Alexander Viro <viro@zeniv.linux.org.uk>
+Cc: Benjamin LaHaise <bcrl@kvack.org>
+Cc: Jann Horn <jannh@google.com>
+Cc: Pavel Emelyanov <xemul@parallels.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/aio.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/fs/aio.c
++++ b/fs/aio.c
+@@ -332,6 +332,9 @@ static int aio_ring_mremap(struct vm_are
+       spin_lock(&mm->ioctx_lock);
+       rcu_read_lock();
+       table = rcu_dereference(mm->ioctx_table);
++      if (!table)
++              goto out_unlock;
++
+       for (i = 0; i < table->nr; i++) {
+               struct kioctx *ctx;
+ 
+@@ -345,6 +348,7 @@ static int aio_ring_mremap(struct vm_are
+               }
+       }
+ 
++out_unlock:
+       rcu_read_unlock();
+       spin_unlock(&mm->ioctx_lock);
+       return res;

diff --git a/queue-4.19/netfilter-nft_tproxy-restrict-to-prerouting-hook.patch b/queue-4.19/netfilter-nft_tproxy-restrict-to-prerouting-hook.patch
new file mode 100644 (file)
index 0000000..086a0cf
--- /dev/null
+++ b/queue-4.19/netfilter-nft_tproxy-restrict-to-prerouting-hook.patch
@@ -0,0 +1,45 @@
+From 18bbc3213383a82b05383827f4b1b882e3f0a5a5 Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw@strlen.de>
+Date: Sat, 20 Aug 2022 17:54:06 +0200
+Subject: netfilter: nft_tproxy: restrict to prerouting hook
+
+From: Florian Westphal <fw@strlen.de>
+
+commit 18bbc3213383a82b05383827f4b1b882e3f0a5a5 upstream.
+
+TPROXY is only allowed from prerouting, but nft_tproxy doesn't check this.
+This fixes a crash (null dereference) when using tproxy from e.g. output.
+
+Fixes: 4ed8eb6570a4 ("netfilter: nf_tables: Add native tproxy support")
+Reported-by: Shell Chen <xierch@gmail.com>
+Signed-off-by: Florian Westphal <fw@strlen.de>
+Signed-off-by: Qingfang DENG <dqfext@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/netfilter/nft_tproxy.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/net/netfilter/nft_tproxy.c
++++ b/net/netfilter/nft_tproxy.c
+@@ -289,6 +289,13 @@ static int nft_tproxy_dump(struct sk_buf
+       return 0;
+ }
+ 
++static int nft_tproxy_validate(const struct nft_ctx *ctx,
++                             const struct nft_expr *expr,
++                             const struct nft_data **data)
++{
++      return nft_chain_validate_hooks(ctx->chain, 1 << NF_INET_PRE_ROUTING);
++}
++
+ static struct nft_expr_type nft_tproxy_type;
+ static const struct nft_expr_ops nft_tproxy_ops = {
+       .type           = &nft_tproxy_type,
+@@ -296,6 +303,7 @@ static const struct nft_expr_ops nft_tpr
+       .eval           = nft_tproxy_eval,
+       .init           = nft_tproxy_init,
+       .dump           = nft_tproxy_dump,
++      .validate       = nft_tproxy_validate,
+ };
+ 
+ static struct nft_expr_type nft_tproxy_type __read_mostly = {

diff --git a/queue-4.19/series b/queue-4.19/series
index 6ad580d628b066f71e24a41891f2230a1f9dcfd3..73959760cbb90b25869fb4e10a165d8890862743 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -65,3 +65,5 @@ asoc-cs42l56-fix-dt-probe.patch
 tools-virtio-fix-the-vringh-test-for-virtio-ring-cha.patch
 net-rose-fix-to-not-accept-on-connected-socket.patch
 nvme-fc-fix-a-missing-queue-put-in-nvmet_fc_ls_creat.patch
+aio-fix-mremap-after-fork-null-deref.patch
+netfilter-nft_tproxy-restrict-to-prerouting-hook.patch