drop queue-5.19/usercopy-use-unsigned-long-instead-of-uintptr_t.patch

diff --git a/queue-5.19/series b/queue-5.19/series
index 9214fddcc09cb69a095506e6f5b3a38a51fd5a77..b4e266abb57d6800a3498e059a419d973cb866b7 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -242,7 +242,6 @@ soc-qcom-aoss-fix-refcount-leak-in-qmp_cooling_devic.patch
 arm-dts-qcom-msm8974-add-required-ranges-to-ocmem.patch
 arm-dts-qcom-pm8841-add-required-thermal-sensor-cell.patch
 bus-hisi_lpc-fix-missing-platform_device_put-in-hisi.patch
-usercopy-use-unsigned-long-instead-of-uintptr_t.patch
 lib-overflow-do-not-define-64-bit-tests-on-32-bit.patch
 stack-declare-randomize_-kstack_offset-to-fix-sparse.patch
 arm64-dts-qcom-msm8916-fix-typo-in-pronto-remoteproc.patch

diff --git a/queue-5.19/usercopy-use-unsigned-long-instead-of-uintptr_t.patch b/queue-5.19/usercopy-use-unsigned-long-instead-of-uintptr_t.patch
deleted file mode 100644 (file)
index 79fc026..0000000
--- a/queue-5.19/usercopy-use-unsigned-long-instead-of-uintptr_t.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6d16116b86e01fdaa4cc08542835ee4bba6a513a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 16 Jun 2022 16:36:17 +0200
-Subject: usercopy: use unsigned long instead of uintptr_t
-
-From: Jason A. Donenfeld <Jason@zx2c4.com>
-
-[ Upstream commit 170b2c350cfcb6f74074e44dd9f916787546db0d ]
-
-A recent commit factored out a series of annoying (unsigned long) casts
-into a single variable declaration, but made the pointer type a
-`uintptr_t` rather than the usual `unsigned long`. This patch changes it
-to be the integer type more typically used by the kernel to represent
-addresses.
-
-Fixes: 35fb9ae4aa2e ("usercopy: Cast pointer to an integer once")
-Cc: Matthew Wilcox <willy@infradead.org>
-Cc: Uladzislau Rezki <urezki@gmail.com>
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Joe Perches <joe@perches.com>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-Signed-off-by: Kees Cook <keescook@chromium.org>
-Link: https://lore.kernel.org/r/20220616143617.449094-1-Jason@zx2c4.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- mm/usercopy.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mm/usercopy.c b/mm/usercopy.c
-index 4e1da708699b..c1ee15a98633 100644
---- a/mm/usercopy.c
-+++ b/mm/usercopy.c
-@@ -161,7 +161,7 @@ static inline void check_bogus_address(const unsigned long ptr, unsigned long n,
- static inline void check_heap_object(const void *ptr, unsigned long n,
-                                    bool to_user)
- {
--      uintptr_t addr = (uintptr_t)ptr;
-+      unsigned long addr = (unsigned long)ptr;
-       unsigned long offset;
-       struct folio *folio;
- 
--- 
-2.35.1
-