Thread (14 messages) 14 messages, 2 authors, 2025-07-24

Re: [PATCH net-next v2 3/5] netconsole: add support for strings with new line in netpoll_parse_ip_addr

flat view

From: Breno Leitao <leitao@debian.org>
Date: 2025-07-23 17:38:03
Also in: lkml

On Wed, Jul 23, 2025 at 03:54:11PM +0100, Simon Horman wrote:
On Mon, Jul 21, 2025 at 06:02:03AM -0700, Breno Leitao wrote:
quoted
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -303,20 +303,21 @@ static void netconsole_print_banner(struct netpoll *np)
 static int netpoll_parse_ip_addr(const char *str, union inet_addr *addr)
 {
 	const char *end;
+	int len;
 
-	if (!strchr(str, ':') &&
-	    in4_pton(str, -1, (void *)addr, -1, &end) > 0) {
-		if (!*end)
-			return 0;
-	}
-	if (in6_pton(str, -1, addr->in6.s6_addr, -1, &end) > 0) {
-#if IS_ENABLED(CONFIG_IPV6)
-		if (!*end)
-			return 1;
-#else
+	len = strlen(str);
+	if (!len)
 		return -1;
+
+	if (str[len - 1] == '\n')
+		len -= 1;
+
+	if (in4_pton(str, len, (void *)addr, -1, &end) > 0)
+		return 0;
+#if IS_ENABLED(CONFIG_IPV6)
+	if (in6_pton(str, len, addr->in6.s6_addr, -1, &end) > 0)
+		return 1;
 #endif
I don't think it needs to block progress.
But FWIIW, I think it would be nice to increase
build coverage and express this as:
Agree. While testing with IPv6 disabled, the netcons selftest exploded,
so, this explose a bug in the selftest. This is now fixed in:

	https://lore.kernel.org/all/20250723-netcons_test_ipv6-v1-1-41c9092f93f9@debian.org/ (local)

Thanks for the review,
--breno
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help