From: Simon Horman <horms@kernel.org>
To: Breno Leitao <leitao@debian.org>
Cc: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-team@meta.com
Subject: Re: [PATCH net-next v2 3/5] netconsole: add support for strings with new line in netpoll_parse_ip_addr
Date: Wed, 23 Jul 2025 15:54:11 +0100 [thread overview]
Message-ID: <20250723144933.GA1036606@horms.kernel.org> (raw)
In-Reply-To: <20250721-netconsole_ref-v2-3-b42f1833565a@debian.org>
On Mon, Jul 21, 2025 at 06:02:03AM -0700, Breno Leitao wrote:
> 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 <leitao@debian.org>
My suggestion below not withstanding, this looks good to me.
Reviewed-by: Simon Horman <horms@kernel.org>
> ---
> drivers/net/netconsole.c | 23 ++++++++++++-----------
> 1 file changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
> index 8d1b93264e0fd..f2c2b8852c603 100644
> --- 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:
if (IS_ENABLED(CONFIG_IPV6) &&
in6_pton(str, len, addr->in6.s6_addr, -1, &end) > 0)
return 1;
next prev parent reply other threads:[~2025-07-23 14:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-21 13:02 [PATCH net-next v2 0/5] netconsole: reuse netpoll_parse_ip_addr in configfs helpers Breno Leitao
2025-07-21 13:02 ` [PATCH net-next v2 1/5] netpoll: Remove unused fields from inet_addr union Breno Leitao
2025-07-23 14:54 ` Simon Horman
2025-07-21 13:02 ` [PATCH net-next v2 2/5] netconsole: move netpoll_parse_ip_addr() earlier for reuse Breno Leitao
2025-07-23 14:55 ` Simon Horman
2025-07-21 13:02 ` [PATCH net-next v2 3/5] netconsole: add support for strings with new line in netpoll_parse_ip_addr Breno Leitao
2025-07-23 14:54 ` Simon Horman [this message]
2025-07-23 17:37 ` Breno Leitao
2025-07-24 20:11 ` Simon Horman
2025-07-21 13:02 ` [PATCH net-next v2 4/5] netconsole: use netpoll_parse_ip_addr in local_ip_store Breno Leitao
2025-07-23 14:54 ` Simon Horman
2025-07-23 15:06 ` Breno Leitao
2025-07-21 13:02 ` [PATCH net-next v2 5/5] " Breno Leitao
2025-07-23 14:54 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250723144933.GA1036606@horms.kernel.org \
--to=horms@kernel.org \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kernel-team@meta.com \
--cc=kuba@kernel.org \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®