Commit 364213b7 authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski
Browse files

netconsole: add support for strings with new line in netpoll_parse_ip_addr 



The current IP address parsing logic fails when the input string
contains a trailing newline character. This can occur when IP
addresses are provided through configfs, which contains newlines in
a const buffer.

Teach netpoll_parse_ip_addr() how to ignore newlines at the end of the
IPs. Also, simplify the code by:

 * No need to check for separators. Try to parse ipv4, if it fails try
   ipv6 similarly to ceph_pton()
 * If ipv6 is not supported, don't call in6_pton() at all.

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Link: https://patch.msgid.link/20250811-netconsole_ref-v4-2-9c510d8713a2@debian.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fa38524c

drivers/net/netconsole.c

+20 −13
Original line number Diff line number Diff line
@@ -300,23 +300,30 @@ static void netconsole_print_banner(struct netpoll *np) 
	np_info(np, "remote ethernet address %pM\n", np->remote_mac);

}



/* Parse the string and populate the `inet_addr` union. Return 0 if IPv4 is

 * populated, 1 if IPv6 is populated, and -1 upon failure.

 */

static int netpoll_parse_ip_addr(const char *str, union inet_addr *addr)

{

	const char *end;

	const char *end = NULL;

	int len;



	len = strlen(str);

	if (!len)

		return -1;



	if (str[len - 1] == '\n')

		len -= 1;



	if (!strchr(str, ':') &&

	    in4_pton(str, -1, (void *)addr, -1, &end) > 0) {

		if (!*end)

	if (in4_pton(str, len, (void *)addr, -1, &end) > 0 &&

	    (!end || *end == 0 || *end == '\n'))

		return 0;

	}

	if (in6_pton(str, -1, addr->in6.s6_addr, -1, &end) > 0) {

#if IS_ENABLED(CONFIG_IPV6)

		if (!*end)



	if (IS_ENABLED(CONFIG_IPV6) &&

	    in6_pton(str, len, (void *)addr, -1, &end) > 0 &&

	    (!end || *end == 0 || *end == '\n'))

		return 1;

#else

		return -1;

#endif

	}



	return -1;

}