0bccce3848
Commit [1] backported an upstream patch to address CVE-2025-46836 that included a regression. Upstream later fixed this regression in commit [2]. This patch add that fix to correct the issue introduced by the original patch. [1]323aaa9f54package/net-tools: add upstream security fix for CVE-2025-46836 [2]ddb0e375fb/ Signed-off-by: Thomas Perale <thomas.perale@mind.be> Signed-off-by: Julien Olivain <ju.o@free.fr> (cherry picked from commitd3274210f9) Signed-off-by: Thomas Perale <thomas.perale@mind.be>
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From ddb0e375fb9ca95bb69335540b85bbdaa2714348 Mon Sep 17 00:00:00 2001
|
|
From: Bernd Eckenfels <net-tools@lina.inka.de>
|
|
Date: Sat, 17 May 2025 21:53:23 +0200
|
|
Subject: [PATCH] Interface statistic regression after 7a8f42fb2
|
|
|
|
CVE: CVE-2025-46836
|
|
Upstream: https://sourceforge.net/p/net-tools/code/ci/ddb0e375fb9ca95bb69335540b85bbdaa2714348/
|
|
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
|
|
---
|
|
lib/interface.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/lib/interface.c b/lib/interface.c
|
|
index a054f12..ca4adf1 100644
|
|
--- a/lib/interface.c
|
|
+++ b/lib/interface.c
|
|
@@ -239,12 +239,11 @@ static const char *get_name(char *name, const char *p)
|
|
/* copy the digits */
|
|
while (*p && isdigit((unsigned char)*p) && dst < end)
|
|
*dst++ = *p++;
|
|
-
|
|
- if (*p == ':') /* consume trailing colon */
|
|
- ++p;
|
|
} else { /* if so treat as normal */
|
|
p = dot;
|
|
}
|
|
+ if (*p == ':') /* consume trailing colon */
|
|
+ ++p;
|
|
break; /* interface name ends here */
|
|
}
|