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: Breno Leitao Reviewed-by: Simon Horman --- drivers/net/netconsole.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 8d1b93264e0fd..3188cc180a934 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -303,20 +303,20 @@ 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; -#endif - } + + if (str[len - 1] == '\n') + len -= 1; + + if (in4_pton(str, len, (void *)addr, -1, &end) > 0) + return 0; + if (IS_ENABLED(CONFIG_IPV6) && + in6_pton(str, len, addr->in6.s6_addr, -1, &end) > 0) + return 1; return -1; } -- 2.47.1