drop another not-needed patch

diff --git a/queue-6.1/mptcp-fix-tracking-issue-in-mptcp_subflow_create_socket.patch b/queue-6.1/mptcp-fix-tracking-issue-in-mptcp_subflow_create_socket.patch
deleted file mode 100644 (file)
index 4c42237..0000000
--- a/queue-6.1/mptcp-fix-tracking-issue-in-mptcp_subflow_create_socket.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d1e96cc4fbe031c19d6fd9d8d2e63c03452fa290 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Tue, 25 Oct 2022 18:05:46 +0000
-Subject: mptcp: fix tracking issue in mptcp_subflow_create_socket()
-
-From: Eric Dumazet <edumazet@google.com>
-
-commit d1e96cc4fbe031c19d6fd9d8d2e63c03452fa290 upstream.
-
-My recent patch missed that mptcp_subflow_create_socket()
-was creating a 'kernel' socket, then converted it to 'user' socket.
-
-Fixes: 0cafd77dcd03 ("net: add a refcount tracker for kernel sockets")
-Reported-by: syzbot <syzkaller@googlegroups.com>
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Cc: Matthieu Baerts <matthieu.baerts@tessares.net>
-Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
-Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
-Link: https://lore.kernel.org/r/20221025180546.652251-1-edumazet@google.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/mptcp/subflow.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/net/mptcp/subflow.c
-+++ b/net/mptcp/subflow.c
-@@ -1616,7 +1616,9 @@ int mptcp_subflow_create_socket(struct s
- 
-       /* kernel sockets do not by default acquire net ref, but TCP timer
-        * needs it.
-+       * Update ns_tracker to current stack trace and refcounted tracker.
-        */
-+      __netns_tracker_free(net, &sf->sk->ns_tracker, false);
-       sf->sk->sk_net_refcnt = 1;
-       get_net_track(net, &sf->sk->ns_tracker, GFP_KERNEL);
-       sock_inuse_add(net, 1);

diff --git a/queue-6.1/series b/queue-6.1/series
index 6f949332933f0fbf000993ddefe810b8a763c1d4..f6819175b8be6225064cf18c87dae79888eef597 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -74,4 +74,3 @@ x86-xen-add-central-hypercall-functions.patch
 x86-xen-use-new-hypercall-functions-instead-of-hypercall-page.patch
 x86-xen-remove-hypercall-page.patch
 alsa-usb-audio-fix-a-dma-to-stack-memory-bug.patch
-mptcp-fix-tracking-issue-in-mptcp_subflow_create_socket.patch