diff --git a/package/iproute2/0001-nstat-NULL-Dereference-when-no-entries-specified.patch b/package/iproute2/0001-nstat-NULL-Dereference-when-no-entries-specified.patch deleted file mode 100644 index 9b5e727fe3..0000000000 --- a/package/iproute2/0001-nstat-NULL-Dereference-when-no-entries-specified.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 866e1d107b7de68ca1fcd1d4d5ffecf9d96bff30 Mon Sep 17 00:00:00 2001 -From: ZiAo Li <23110240084@m.fudan.edu.cn> -Date: Wed, 9 Apr 2025 23:03:30 +0800 -Subject: [PATCH] nstat: NULL Dereference when no entries specified - -The NULL Pointer Dereference vulnerability happens in load_ugly_table(), misc/nstat.c, in the latest version of iproute2. -The vulnerability can be triggered by: -1. db is set to NULL at struct nstat_ent *db = NULL; -2. n is set to NULL at n = db; -3. NULL dereference of variable n happens at sscanf(p+1, "%llu", &n->val) != 1 - -Signed-off-by: ZiAo Li <23110240084@m.fudan.edu.cn> -Signed-off-by: Stephen Hemminger -Upstream: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=866e1d107b7de68ca1fcd1d4d5ffecf9d96bff30 ---- - misc/nstat.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/misc/nstat.c b/misc/nstat.c -index fce3e9c1..b2e19bde 100644 ---- a/misc/nstat.c -+++ b/misc/nstat.c -@@ -218,6 +218,10 @@ static void load_ugly_table(FILE *fp) - p = next; - } - n = db; -+ if (n == NULL) { -+ fprintf(stderr, "Error: Invalid input – line has ':' but no entries. Add values after ':'.\n"); -+ exit(-2); -+ } - nread = getline(&buf, &buflen, fp); - if (nread == -1) { - fprintf(stderr, "%s:%d: error parsing history file\n", --- -2.49.0 - diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index d64ff918c6..69de2917cf 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 a6d23588150096591c3d00fc27a324a82ee71d7a1a9eea78df5df17ad9b8461f iproute2-6.14.0.tar.xz +sha256 8041854a882583ad5263466736c9c8c68c74b1a35754ab770d23343f947528fb iproute2-6.15.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 3faa2235b8..e3076a59a8 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.14.0 +IPROUTE2_VERSION = 6.15.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \