Drop skbuff-don-t-mix-ubuf_info-from-different-sources.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/series b/queue-5.15/series
index 08f7787c782db2f3613f4aaf9596e84251a38c46..687572698aa78cb6dbc5b380e2673c43964b2a4d 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -147,7 +147,6 @@ hwmon-sht15-fix-wrong-assumptions-in-device-remove-c.patch
 pm-hibernate-defer-device-probing-when-resuming-from.patch
 selinux-fix-memleak-in-security_read_state_kernel.patch
 selinux-add-boundary-check-in-put_entry.patch
-skbuff-don-t-mix-ubuf_info-from-different-sources.patch
 kasan-test-silence-gcc-12-warnings.patch
 drm-amdgpu-remove-one-duplicated-ef-removal.patch
 powerpc-64s-disable-stack-variable-initialisation-fo.patch

diff --git a/queue-5.15/skbuff-don-t-mix-ubuf_info-from-different-sources.patch b/queue-5.15/skbuff-don-t-mix-ubuf_info-from-different-sources.patch
deleted file mode 100644 (file)
index 5fd809d..0000000
--- a/queue-5.15/skbuff-don-t-mix-ubuf_info-from-different-sources.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3f20263fd2e33b027ad8f19f91a8c40c90c644b9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 12 Jul 2022 21:52:27 +0100
-Subject: skbuff: don't mix ubuf_info from different sources
-
-From: Pavel Begunkov <asml.silence@gmail.com>
-
-[ Upstream commit 1b4b2b09d4fb451029b112f17d34792e0277aeb2 ]
-
-We should not append MSG_ZEROCOPY requests to skbuff with non
-MSG_ZEROCOPY ubuf_info, they might be not compatible.
-
-Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/core/skbuff.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index 5ebef94e14dc..891db074981e 100644
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -1213,6 +1213,10 @@ struct ubuf_info *msg_zerocopy_realloc(struct sock *sk, size_t size,
-               const u32 byte_limit = 1 << 19;         /* limit to a few TSO */
-               u32 bytelen, next;
- 
-+              /* there might be non MSG_ZEROCOPY users */
-+              if (uarg->callback != msg_zerocopy_callback)
-+                      return NULL;
-+
-               /* realloc only when socket is locked (TCP, UDP cork),
-                * so uarg->len and sk_zckey access is serialized
-                */
--- 
-2.35.1
-

diff --git a/queue-5.18/series b/queue-5.18/series
index ada8f4b585bde2b1f800eeb5d215ef683fb3da5d..83ddd0b33e88833ef147b59623b2a25c7de5b2df 100644 (file)
--- a/queue-5.18/series
+++ b/queue-5.18/series
@@ -177,7 +177,6 @@ hwmon-sht15-fix-wrong-assumptions-in-device-remove-c.patch
 pm-hibernate-defer-device-probing-when-resuming-from.patch
 selinux-fix-memleak-in-security_read_state_kernel.patch
 selinux-add-boundary-check-in-put_entry.patch
-skbuff-don-t-mix-ubuf_info-from-different-sources.patch
 kasan-test-silence-gcc-12-warnings.patch
 pinctrl-don-t-allow-pinctrl_amd-to-be-a-module.patch
 drm-amdgpu-remove-one-duplicated-ef-removal.patch

diff --git a/queue-5.18/skbuff-don-t-mix-ubuf_info-from-different-sources.patch b/queue-5.18/skbuff-don-t-mix-ubuf_info-from-different-sources.patch
deleted file mode 100644 (file)
index 5c330ae..0000000
--- a/queue-5.18/skbuff-don-t-mix-ubuf_info-from-different-sources.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d1959956b570029e2d9f1b470609384904fbfe3d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 12 Jul 2022 21:52:27 +0100
-Subject: skbuff: don't mix ubuf_info from different sources
-
-From: Pavel Begunkov <asml.silence@gmail.com>
-
-[ Upstream commit 1b4b2b09d4fb451029b112f17d34792e0277aeb2 ]
-
-We should not append MSG_ZEROCOPY requests to skbuff with non
-MSG_ZEROCOPY ubuf_info, they might be not compatible.
-
-Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/core/skbuff.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index c90c74de90d5..7d35cee8b00e 100644
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -1210,6 +1210,10 @@ struct ubuf_info *msg_zerocopy_realloc(struct sock *sk, size_t size,
-               const u32 byte_limit = 1 << 19;         /* limit to a few TSO */
-               u32 bytelen, next;
- 
-+              /* there might be non MSG_ZEROCOPY users */
-+              if (uarg->callback != msg_zerocopy_callback)
-+                      return NULL;
-+
-               /* realloc only when socket is locked (TCP, UDP cork),
-                * so uarg->len and sk_zckey access is serialized
-                */
--- 
-2.35.1
-

diff --git a/queue-5.19/series b/queue-5.19/series
index 5cc86036891f4b79fd7b901f41ab1d4657727283..2a7ae1c6d929de886e3326f4687d53032f1eb8d9 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -192,7 +192,6 @@ hwmon-sht15-fix-wrong-assumptions-in-device-remove-c.patch
 pm-hibernate-defer-device-probing-when-resuming-from.patch
 selinux-fix-memleak-in-security_read_state_kernel.patch
 selinux-add-boundary-check-in-put_entry.patch
-skbuff-don-t-mix-ubuf_info-from-different-sources.patch
 io_uring-fix-io_uring_cqe_overflow-trace-format.patch
 kasan-test-silence-gcc-12-warnings.patch
 wait-fix-__wait_event_hrtimeout-for-rt-dl-tasks.patch

diff --git a/queue-5.19/skbuff-don-t-mix-ubuf_info-from-different-sources.patch b/queue-5.19/skbuff-don-t-mix-ubuf_info-from-different-sources.patch
deleted file mode 100644 (file)
index e301a89..0000000
--- a/queue-5.19/skbuff-don-t-mix-ubuf_info-from-different-sources.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 76b7f87b643127d05602d1bbbc2e8500399ddcd8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 12 Jul 2022 21:52:27 +0100
-Subject: skbuff: don't mix ubuf_info from different sources
-
-From: Pavel Begunkov <asml.silence@gmail.com>
-
-[ Upstream commit 1b4b2b09d4fb451029b112f17d34792e0277aeb2 ]
-
-We should not append MSG_ZEROCOPY requests to skbuff with non
-MSG_ZEROCOPY ubuf_info, they might be not compatible.
-
-Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- net/core/skbuff.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index 5b3559cb1d82..09f56bfa2771 100644
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -1212,6 +1212,10 @@ struct ubuf_info *msg_zerocopy_realloc(struct sock *sk, size_t size,
-               const u32 byte_limit = 1 << 19;         /* limit to a few TSO */
-               u32 bytelen, next;
- 
-+              /* there might be non MSG_ZEROCOPY users */
-+              if (uarg->callback != msg_zerocopy_callback)
-+                      return NULL;
-+
-               /* realloc only when socket is locked (TCP, UDP cork),
-                * so uarg->len and sk_zckey access is serialized
-                */
--- 
-2.35.1
-