]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop a bunch of nolibc patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jun 2025 14:03:06 +0000 (16:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jun 2025 14:03:06 +0000 (16:03 +0200)
one of them breaks the arm64 build...

14 files changed:
queue-6.1/series
queue-6.1/tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch [deleted file]
queue-6.1/tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch [deleted file]
queue-6.12/series
queue-6.12/tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch [deleted file]
queue-6.12/tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch [deleted file]
queue-6.15/net-fix-udp-gso-skb_segment-after-pull-from-frag_lis.patch
queue-6.15/series
queue-6.15/tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch [deleted file]
queue-6.15/tools-nolibc-properly-align-dirent-buffer.patch [deleted file]
queue-6.15/tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch [deleted file]
queue-6.6/series
queue-6.6/tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch [deleted file]
queue-6.6/tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch [deleted file]

index cfd6bebce214be27f57c702bd944649e3e3a5fe3..67eed5d1c912abe36b8fe099251de372158af731 100644 (file)
@@ -22,10 +22,8 @@ crypto-marvell-cesa-avoid-empty-transfer-descriptor.patch
 crypto-lrw-only-add-ecb-if-it-is-not-already-there.patch
 crypto-xts-only-add-ecb-if-it-is-not-already-there.patch
 crypto-sun8i-ce-move-fallback-ahash_request-to-the-e.patch
-tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch
 asoc-tas2764-enable-main-irqs.patch
 edac-skx_common-fix-general-protection-fault.patch
-tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch
 spi-tegra210-quad-fix-x1_x2_x4-encoding-and-support-.patch
 spi-tegra210-quad-remove-redundant-error-handling-co.patch
 spi-tegra210-quad-modify-chip-select-cs-deactivation.patch
diff --git a/queue-6.1/tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch b/queue-6.1/tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch
deleted file mode 100644 (file)
index 452b6de..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5ad3e4c516aec9ef9a33a5d9ef804102a667a473 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 19 Apr 2025 12:46:22 +0200
-Subject: tools/nolibc: fix integer overflow in i{64,}toa_r() and
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Thomas Weißschuh <linux@weissschuh.net>
-
-[ Upstream commit 4d231a7df1a85c7572b67a4666cb73adb977fbf6 ]
-
-In twos complement the most negative number can not be negated.
-
-Fixes: b1c21e7d99cd ("tools/nolibc/stdlib: add i64toa() and u64toa()")
-Fixes: 66c397c4d2e1 ("tools/nolibc/stdlib: replace the ltoa() function with more efficient ones")
-Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
-Acked-by: Willy Tarreau <w@1wt.eu>
-Link: https://lore.kernel.org/r/20250419-nolibc-ubsan-v2-5-060b8a016917@weissschuh.net
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/stdlib.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/include/nolibc/stdlib.h b/tools/include/nolibc/stdlib.h
-index c0c3854b3f35b..cbed8a12d99e9 100644
---- a/tools/include/nolibc/stdlib.h
-+++ b/tools/include/nolibc/stdlib.h
-@@ -255,7 +255,7 @@ int itoa_r(long in, char *buffer)
-       int len = 0;
-       if (in < 0) {
--              in = -in;
-+              in = -(unsigned long)in;
-               *(ptr++) = '-';
-               len++;
-       }
-@@ -391,7 +391,7 @@ int i64toa_r(int64_t in, char *buffer)
-       int len = 0;
-       if (in < 0) {
--              in = -in;
-+              in = -(uint64_t)in;
-               *(ptr++) = '-';
-               len++;
-       }
--- 
-2.39.5
-
diff --git a/queue-6.1/tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch b/queue-6.1/tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch
deleted file mode 100644 (file)
index 9d3eb48..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From cc506448cb52cfc994a0a184b6540a4890b06ee7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 11 Apr 2025 15:36:24 +0800
-Subject: tools/nolibc/types.h: fix mismatched parenthesis in minor()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jemmy Wong <jemmywong512@gmail.com>
-
-[ Upstream commit 9c138ac9392228835b520fd4dbb07e636b34a867 ]
-
-Fix an imbalance where opening parentheses exceed closing ones.
-
-Fixes: eba6d00d38e7c ("tools/nolibc/types: move makedev to types.h and make it a macro")
-Signed-off-by: Jemmy Wong <jemmywong512@gmail.com>
-Acked-by: Willy Tarreau <w@1wt.eu>
-Link: https://lore.kernel.org/r/20250411073624.22153-1-jemmywong512@gmail.com
-Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/types.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/include/nolibc/types.h b/tools/include/nolibc/types.h
-index fbbc0e68c001b..598d1ef811859 100644
---- a/tools/include/nolibc/types.h
-+++ b/tools/include/nolibc/types.h
-@@ -196,7 +196,7 @@ struct stat {
- /* WARNING, it only deals with the 4096 first majors and 256 first minors */
- #define makedev(major, minor) ((dev_t)((((major) & 0xfff) << 8) | ((minor) & 0xff)))
- #define major(dev) ((unsigned int)(((dev) >> 8) & 0xfff))
--#define minor(dev) ((unsigned int)(((dev) & 0xff))
-+#define minor(dev) ((unsigned int)((dev) & 0xff))
- #ifndef offsetof
- #define offsetof(TYPE, FIELD) ((size_t) &((TYPE *)0)->FIELD)
--- 
-2.39.5
-
index 07bae18b8c172b665eda352e064c572861662649..831212415763bf85504e1f136a8b0fad6de8317d 100644 (file)
@@ -34,12 +34,10 @@ crypto-sun8i-ce-move-fallback-ahash_request-to-the-e.patch
 kunit-fix-wrong-parameter-to-kunit_deactivate_static.patch
 crypto-api-redo-lookup-on-eexist.patch
 acpica-exserial-don-t-forget-to-handle-ffixedhw-opre.patch
-tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch
 asoc-tas2764-enable-main-irqs.patch
 asoc-mediatek-mt8195-set-etdm1-2-in-out-to-comp_dumm.patch
 edac-skx_common-fix-general-protection-fault.patch
 edac-skx_common-i10nm-fix-the-loss-of-saved-rrl-for-.patch
-tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch
 spi-tegra210-quad-fix-x1_x2_x4-encoding-and-support-.patch
 spi-tegra210-quad-remove-redundant-error-handling-co.patch
 spi-tegra210-quad-modify-chip-select-cs-deactivation.patch
diff --git a/queue-6.12/tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch b/queue-6.12/tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch
deleted file mode 100644 (file)
index c463abd..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3d9cf29f620f9beeb2591ca99ff4bad8b01a39dc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 19 Apr 2025 12:46:22 +0200
-Subject: tools/nolibc: fix integer overflow in i{64,}toa_r() and
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Thomas Weißschuh <linux@weissschuh.net>
-
-[ Upstream commit 4d231a7df1a85c7572b67a4666cb73adb977fbf6 ]
-
-In twos complement the most negative number can not be negated.
-
-Fixes: b1c21e7d99cd ("tools/nolibc/stdlib: add i64toa() and u64toa()")
-Fixes: 66c397c4d2e1 ("tools/nolibc/stdlib: replace the ltoa() function with more efficient ones")
-Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
-Acked-by: Willy Tarreau <w@1wt.eu>
-Link: https://lore.kernel.org/r/20250419-nolibc-ubsan-v2-5-060b8a016917@weissschuh.net
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/stdlib.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/include/nolibc/stdlib.h b/tools/include/nolibc/stdlib.h
-index 75aa273c23a61..4dd421ef4c021 100644
---- a/tools/include/nolibc/stdlib.h
-+++ b/tools/include/nolibc/stdlib.h
-@@ -274,7 +274,7 @@ int itoa_r(long in, char *buffer)
-       int len = 0;
-       if (in < 0) {
--              in = -in;
-+              in = -(unsigned long)in;
-               *(ptr++) = '-';
-               len++;
-       }
-@@ -410,7 +410,7 @@ int i64toa_r(int64_t in, char *buffer)
-       int len = 0;
-       if (in < 0) {
--              in = -in;
-+              in = -(uint64_t)in;
-               *(ptr++) = '-';
-               len++;
-       }
--- 
-2.39.5
-
diff --git a/queue-6.12/tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch b/queue-6.12/tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch
deleted file mode 100644 (file)
index b298613..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 84a4e78af4fe894964f0789cca0fde980285acfe Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 11 Apr 2025 15:36:24 +0800
-Subject: tools/nolibc/types.h: fix mismatched parenthesis in minor()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jemmy Wong <jemmywong512@gmail.com>
-
-[ Upstream commit 9c138ac9392228835b520fd4dbb07e636b34a867 ]
-
-Fix an imbalance where opening parentheses exceed closing ones.
-
-Fixes: eba6d00d38e7c ("tools/nolibc/types: move makedev to types.h and make it a macro")
-Signed-off-by: Jemmy Wong <jemmywong512@gmail.com>
-Acked-by: Willy Tarreau <w@1wt.eu>
-Link: https://lore.kernel.org/r/20250411073624.22153-1-jemmywong512@gmail.com
-Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/types.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/include/nolibc/types.h b/tools/include/nolibc/types.h
-index b26a5d0c417c7..32d0929c633bb 100644
---- a/tools/include/nolibc/types.h
-+++ b/tools/include/nolibc/types.h
-@@ -201,7 +201,7 @@ struct stat {
- /* WARNING, it only deals with the 4096 first majors and 256 first minors */
- #define makedev(major, minor) ((dev_t)((((major) & 0xfff) << 8) | ((minor) & 0xff)))
- #define major(dev) ((unsigned int)(((dev) >> 8) & 0xfff))
--#define minor(dev) ((unsigned int)(((dev) & 0xff))
-+#define minor(dev) ((unsigned int)((dev) & 0xff))
- #ifndef offsetof
- #define offsetof(TYPE, FIELD) ((size_t) &((TYPE *)0)->FIELD)
--- 
-2.39.5
-
index 99957359b6698b02c057af75895f03e1c737b274..c7040d85584bf98a54dc2ea7e05b08c633a8dc54 100644 (file)
@@ -76,14 +76,12 @@ Reviewed-by: Willem de Bruijn <willemb@google.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- net/ipv4/udp_offload.c | 5 +++++
+ net/ipv4/udp_offload.c |    5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
-index 9c775f8aa4385..85b5aa82d7d74 100644
 --- a/net/ipv4/udp_offload.c
 +++ b/net/ipv4/udp_offload.c
-@@ -495,6 +495,7 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,
+@@ -332,6 +332,7 @@ struct sk_buff *__udp_gso_segment(struct
        bool copy_dtor;
        __sum16 check;
        __be16 newlen;
@@ -91,7 +89,7 @@ index 9c775f8aa4385..85b5aa82d7d74 100644
  
        mss = skb_shinfo(gso_skb)->gso_size;
        if (gso_skb->len <= sizeof(*uh) + mss)
-@@ -523,6 +524,10 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,
+@@ -360,6 +361,10 @@ struct sk_buff *__udp_gso_segment(struct
                if (skb_pagelen(gso_skb) - sizeof(*uh) == skb_shinfo(gso_skb)->gso_size)
                        return __udp_gso_segment_list(gso_skb, features, is_ipv6);
  
@@ -102,6 +100,3 @@ index 9c775f8aa4385..85b5aa82d7d74 100644
                 /* Setup csum, as fraglist skips this in udp4_gro_receive. */
                gso_skb->csum_start = skb_transport_header(gso_skb) - gso_skb->head;
                gso_skb->csum_offset = offsetof(struct udphdr, check);
--- 
-2.39.5
-
index 631d8c822f9a094265c1e3301d0b1800b60c320a..6e3c0911a079227933074faac14654ac8bc7cced 100644 (file)
@@ -51,14 +51,11 @@ gfs2-move-gfs2_trans_add_databufs.patch
 gfs2-don-t-start-unnecessary-transactions-during-log.patch
 crypto-api-redo-lookup-on-eexist.patch
 acpica-exserial-don-t-forget-to-handle-ffixedhw-opre.patch
-tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch
 asoc-tas2764-reinit-cache-on-part-reset.patch
 asoc-tas2764-enable-main-irqs.patch
 asoc-mediatek-mt8195-set-etdm1-2-in-out-to-comp_dumm.patch
 edac-skx_common-fix-general-protection-fault.patch
 edac-skx_common-i10nm-fix-the-loss-of-saved-rrl-for-.patch
-tools-nolibc-properly-align-dirent-buffer.patch
-tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch
 spi-tegra210-quad-fix-x1_x2_x4-encoding-and-support-.patch
 spi-tegra210-quad-remove-redundant-error-handling-co.patch
 spi-tegra210-quad-modify-chip-select-cs-deactivation.patch
diff --git a/queue-6.15/tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch b/queue-6.15/tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch
deleted file mode 100644 (file)
index 8d2f72e..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-From 75026185123fd95e74c3728af6e4bd3c0cfd0bea Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 19 Apr 2025 12:46:22 +0200
-Subject: tools/nolibc: fix integer overflow in i{64,}toa_r() and
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Thomas Weißschuh <linux@weissschuh.net>
-
-[ Upstream commit 4d231a7df1a85c7572b67a4666cb73adb977fbf6 ]
-
-In twos complement the most negative number can not be negated.
-
-Fixes: b1c21e7d99cd ("tools/nolibc/stdlib: add i64toa() and u64toa()")
-Fixes: 66c397c4d2e1 ("tools/nolibc/stdlib: replace the ltoa() function with more efficient ones")
-Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
-Acked-by: Willy Tarreau <w@1wt.eu>
-Link: https://lore.kernel.org/r/20250419-nolibc-ubsan-v2-5-060b8a016917@weissschuh.net
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/stdlib.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/include/nolibc/stdlib.h b/tools/include/nolibc/stdlib.h
-index 86ad378ab1ea2..32b3038002c16 100644
---- a/tools/include/nolibc/stdlib.h
-+++ b/tools/include/nolibc/stdlib.h
-@@ -275,7 +275,7 @@ int itoa_r(long in, char *buffer)
-       int len = 0;
-       if (in < 0) {
--              in = -in;
-+              in = -(unsigned long)in;
-               *(ptr++) = '-';
-               len++;
-       }
-@@ -411,7 +411,7 @@ int i64toa_r(int64_t in, char *buffer)
-       int len = 0;
-       if (in < 0) {
--              in = -in;
-+              in = -(uint64_t)in;
-               *(ptr++) = '-';
-               len++;
-       }
--- 
-2.39.5
-
diff --git a/queue-6.15/tools-nolibc-properly-align-dirent-buffer.patch b/queue-6.15/tools-nolibc-properly-align-dirent-buffer.patch
deleted file mode 100644 (file)
index e9ec153..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From ee7908c69769df295b8a2ca40eacee387fd1fafc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 19 Apr 2025 12:46:21 +0200
-Subject: tools/nolibc: properly align dirent buffer
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Thomas Weißschuh <linux@weissschuh.net>
-
-[ Upstream commit 0e75768ba24d669dbf76530e21fd51cfe2fbd2a9 ]
-
-As byte buffer is overlaid with a 'struct dirent64'.
-it has to satisfy the structs alignment requirements.
-
-Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
-Fixes: 665fa8dea90d ("tools/nolibc: add support for directory access")
-Acked-by: Willy Tarreau <w@1wt.eu>
-Link: https://lore.kernel.org/r/20250419-nolibc-ubsan-v2-4-060b8a016917@weissschuh.net
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/dirent.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tools/include/nolibc/dirent.h b/tools/include/nolibc/dirent.h
-index c5c30d0dd6806..946a697e98e4c 100644
---- a/tools/include/nolibc/dirent.h
-+++ b/tools/include/nolibc/dirent.h
-@@ -7,6 +7,7 @@
- #ifndef _NOLIBC_DIRENT_H
- #define _NOLIBC_DIRENT_H
-+#include "compiler.h"
- #include "stdint.h"
- #include "types.h"
-@@ -58,7 +59,7 @@ int closedir(DIR *dirp)
- static __attribute__((unused))
- int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
- {
--      char buf[sizeof(struct linux_dirent64) + NAME_MAX + 1];
-+      char buf[sizeof(struct linux_dirent64) + NAME_MAX + 1] __nolibc_aligned_as(struct linux_dirent64);
-       struct linux_dirent64 *ldir = (void *)buf;
-       intptr_t i = (intptr_t)dirp;
-       int fd, ret;
--- 
-2.39.5
-
diff --git a/queue-6.15/tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch b/queue-6.15/tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch
deleted file mode 100644 (file)
index a9cfd6e..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 45379fa935ba1974a35a3b5e45b6526f71173140 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 11 Apr 2025 15:36:24 +0800
-Subject: tools/nolibc/types.h: fix mismatched parenthesis in minor()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jemmy Wong <jemmywong512@gmail.com>
-
-[ Upstream commit 9c138ac9392228835b520fd4dbb07e636b34a867 ]
-
-Fix an imbalance where opening parentheses exceed closing ones.
-
-Fixes: eba6d00d38e7c ("tools/nolibc/types: move makedev to types.h and make it a macro")
-Signed-off-by: Jemmy Wong <jemmywong512@gmail.com>
-Acked-by: Willy Tarreau <w@1wt.eu>
-Link: https://lore.kernel.org/r/20250411073624.22153-1-jemmywong512@gmail.com
-Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/types.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/include/nolibc/types.h b/tools/include/nolibc/types.h
-index b26a5d0c417c7..32d0929c633bb 100644
---- a/tools/include/nolibc/types.h
-+++ b/tools/include/nolibc/types.h
-@@ -201,7 +201,7 @@ struct stat {
- /* WARNING, it only deals with the 4096 first majors and 256 first minors */
- #define makedev(major, minor) ((dev_t)((((major) & 0xfff) << 8) | ((minor) & 0xff)))
- #define major(dev) ((unsigned int)(((dev) >> 8) & 0xfff))
--#define minor(dev) ((unsigned int)(((dev) & 0xff))
-+#define minor(dev) ((unsigned int)((dev) & 0xff))
- #ifndef offsetof
- #define offsetof(TYPE, FIELD) ((size_t) &((TYPE *)0)->FIELD)
--- 
-2.39.5
-
index 883d5cdeca7fe18896b8c8da149a46c05bd67253..aa8347a9a396904ad3e76fa43f437d139484081d 100644 (file)
@@ -36,11 +36,9 @@ crypto-xts-only-add-ecb-if-it-is-not-already-there.patch
 crypto-sun8i-ce-move-fallback-ahash_request-to-the-e.patch
 kunit-fix-wrong-parameter-to-kunit_deactivate_static.patch
 acpica-exserial-don-t-forget-to-handle-ffixedhw-opre.patch
-tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch
 asoc-tas2764-enable-main-irqs.patch
 edac-skx_common-fix-general-protection-fault.patch
 edac-skx_common-i10nm-fix-the-loss-of-saved-rrl-for-.patch
-tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch
 spi-tegra210-quad-fix-x1_x2_x4-encoding-and-support-.patch
 spi-tegra210-quad-remove-redundant-error-handling-co.patch
 spi-tegra210-quad-modify-chip-select-cs-deactivation.patch
diff --git a/queue-6.6/tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch b/queue-6.6/tools-nolibc-fix-integer-overflow-in-i-64-toa_r-and.patch
deleted file mode 100644 (file)
index c84ede9..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-From b7207c846d79eb4c687518d0ef619166d6648a9a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 19 Apr 2025 12:46:22 +0200
-Subject: tools/nolibc: fix integer overflow in i{64,}toa_r() and
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Thomas Weißschuh <linux@weissschuh.net>
-
-[ Upstream commit 4d231a7df1a85c7572b67a4666cb73adb977fbf6 ]
-
-In twos complement the most negative number can not be negated.
-
-Fixes: b1c21e7d99cd ("tools/nolibc/stdlib: add i64toa() and u64toa()")
-Fixes: 66c397c4d2e1 ("tools/nolibc/stdlib: replace the ltoa() function with more efficient ones")
-Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
-Acked-by: Willy Tarreau <w@1wt.eu>
-Link: https://lore.kernel.org/r/20250419-nolibc-ubsan-v2-5-060b8a016917@weissschuh.net
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/stdlib.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/include/nolibc/stdlib.h b/tools/include/nolibc/stdlib.h
-index 5be9d3c7435a8..6bf62f5048faa 100644
---- a/tools/include/nolibc/stdlib.h
-+++ b/tools/include/nolibc/stdlib.h
-@@ -274,7 +274,7 @@ int itoa_r(long in, char *buffer)
-       int len = 0;
-       if (in < 0) {
--              in = -in;
-+              in = -(unsigned long)in;
-               *(ptr++) = '-';
-               len++;
-       }
-@@ -410,7 +410,7 @@ int i64toa_r(int64_t in, char *buffer)
-       int len = 0;
-       if (in < 0) {
--              in = -in;
-+              in = -(uint64_t)in;
-               *(ptr++) = '-';
-               len++;
-       }
--- 
-2.39.5
-
diff --git a/queue-6.6/tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch b/queue-6.6/tools-nolibc-types.h-fix-mismatched-parenthesis-in-m.patch
deleted file mode 100644 (file)
index 71edccf..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From cee6e0da0f81b1230e4f30af35a053bce5699726 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 11 Apr 2025 15:36:24 +0800
-Subject: tools/nolibc/types.h: fix mismatched parenthesis in minor()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jemmy Wong <jemmywong512@gmail.com>
-
-[ Upstream commit 9c138ac9392228835b520fd4dbb07e636b34a867 ]
-
-Fix an imbalance where opening parentheses exceed closing ones.
-
-Fixes: eba6d00d38e7c ("tools/nolibc/types: move makedev to types.h and make it a macro")
-Signed-off-by: Jemmy Wong <jemmywong512@gmail.com>
-Acked-by: Willy Tarreau <w@1wt.eu>
-Link: https://lore.kernel.org/r/20250411073624.22153-1-jemmywong512@gmail.com
-Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/types.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/include/nolibc/types.h b/tools/include/nolibc/types.h
-index 8cfc4c860fa44..053ffa222ffcb 100644
---- a/tools/include/nolibc/types.h
-+++ b/tools/include/nolibc/types.h
-@@ -222,7 +222,7 @@ struct stat {
- /* WARNING, it only deals with the 4096 first majors and 256 first minors */
- #define makedev(major, minor) ((dev_t)((((major) & 0xfff) << 8) | ((minor) & 0xff)))
- #define major(dev) ((unsigned int)(((dev) >> 8) & 0xfff))
--#define minor(dev) ((unsigned int)(((dev) & 0xff))
-+#define minor(dev) ((unsigned int)((dev) & 0xff))
- #ifndef offsetof
- #define offsetof(TYPE, FIELD) ((size_t) &((TYPE *)0)->FIELD)
--- 
-2.39.5
-