From nobody Sun Oct 5 00:07:11 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2C562D6E69; Mon, 11 Aug 2025 18:13:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754936022; cv=none; b=cTcm3YPwKgjqODFMMbhkZ8nTe/BEtvXoHmAssTJVuYUId8lkd5kk8MaFtZJuQ9L7MBqR5epfA0W66ptz9kqYC7oUoCRD5on0ekT+2aCVK2/ZOjKNH9virfb8sjTVyB668+xEzZfDO0uQnfQNMSI7iPJsTmSgHeklkOhRgxFRrq4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754936022; c=relaxed/simple; bh=t0nywAxhzDKESKlaUOamFLLZCT5IE22C/isprjTyA3k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dnddg8+M8zs7dXvOs4r8QQmU9g496zQPTvqePF9ZLEC9Jnmj/TtOMYWOK7vrFdJntnzvFtYaQ/hiZlimPDr1yBREGK3twCpFUsPbaBwHBL6hc8P3NuS5Eg0qbvux9c0fvqqoHvm+ylXBQ+bVY4IRRZb36e+WcuA7yIuPMugz53o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-af937728c3eso886908966b.0; Mon, 11 Aug 2025 11:13:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754936019; x=1755540819; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZV9CK2FNV1Hmm/C2rkmRgK4FmGCVPwlQy2penm7Yjj0=; b=bDw0fZPzNzSrey0gCQNlzTuPSEhMd0BvXcfClb2pelvpXxwkUrw+BEsnNDpzseKLrV jK86XxgjzfdBnfAb5RMxwkCnkIPH81hKw4LeBJRD0zzFlxUyAGWCzCN40tbE2rLhLH+s MPq4QpptG87z1VGpBFIzzDQsDSJmDIpLCQkVsRwDPO1liGPO1+yCSepMjfh486fCZR+1 0H/usX0BHxvFwR4EhCghxgfpFJeBpT1063QsHas6fSVQzh5N1wq8BSTZbVNUj8HcmvR9 JAlkyQlv6hRyrGcW4RHx3jG5e6SVP3ZgOnT7eGo/BzgrN/FfDVIvmkeNO01o8hfZpd6N WHGA== X-Forwarded-Encrypted: i=1; AJvYcCUOUGfOqr25nOJFipHoNRKTWrpXRoAa+ghFtUvTnHnWYiiv8DhOUSA0SLFX3qfElua71/vu7v+/ZhU1C1E=@vger.kernel.org X-Gm-Message-State: AOJu0YzApo141rxJh2ZY6ZeK7oO7nkzgNfMfApIvCmEcz66UOCfK9Bft 86gjsgwlEbvPCHVjydA0H80+X8WMgvtrsz1ELPb+VvBW3VA0zjylxL0/ X-Gm-Gg: ASbGnctiV3CifPFvos1dZKGSIFth2nseB+xbjkeV6ErUmLaPAspA332NmLaGtibOCRe B6qUXRZaNPrKYNCYBAV3A3CgrZqPf7qrRHLMrffyNwH62EyufAqvH1C7Pn8udrOPD8kgMMejJ/t lgpfRtdUqdM1HT8XXPp+GJQiuVpWOOAN/GMNE1wL9pAErW2W2unF9ZfEMolInbqelueYbGhpWql dtJ1iD+MYVcJLSNJVqkZQ3kxKIBIP3/uIQRtt1QSn7sLuVemaHuBDpgEbYKY+eZyW1GQ1mLF6y0 UC2JClhqWWACgaqsWsJThvPsrpAgRqOV1h/xosYVG0m0Wvvh/4bN6/C2NQnkf3j02EVLRO8e1Gs 9CZS6XVVFVFpRJw== X-Google-Smtp-Source: AGHT+IGcodICKFzzClDeay7gx7ULx55WfovxXuBJt/2GnH5BzUI7IPXkDAZrsBVTCfrh9QWbFm21JA== X-Received: by 2002:a17:906:fe41:b0:ae9:c8f6:bd3 with SMTP id a640c23a62f3a-afa1d65b1cbmr67832266b.7.1754936019007; Mon, 11 Aug 2025 11:13:39 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:71::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-61821e562c0sm3023798a12.30.2025.08.11.11.13.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Aug 2025 11:13:38 -0700 (PDT) From: Breno Leitao Date: Mon, 11 Aug 2025 11:13:25 -0700 Subject: [PATCH net-next v4 1/4] netconsole: move netpoll_parse_ip_addr() earlier for reuse Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250811-netconsole_ref-v4-1-9c510d8713a2@debian.org> References: <20250811-netconsole_ref-v4-0-9c510d8713a2@debian.org> In-Reply-To: <20250811-netconsole_ref-v4-0-9c510d8713a2@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Breno Leitao , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=1932; i=leitao@debian.org; h=from:subject:message-id; bh=t0nywAxhzDKESKlaUOamFLLZCT5IE22C/isprjTyA3k=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBomjLPzuEouyi566OYrtZ9xNUFhRilK2dUmHffz EBmhpXCb2uJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaJoyzwAKCRA1o5Of/Hh3 bX5ND/93BmHnhsqtNODio27M1cnloTshRdJfx9sgw05vmFVAXwakGB09r7sJn2wja3o07E6pp6O vFha8QMIai37o7BdA217+r6JCVDLvNqL79I7E9jM82mSY9pD3x7IKHCXUqhJtV3XAv46/u6IPXi 100a6Z8Vsw9nsrhqo99pQRVqLgZX5kPi8k5G/nik2/WF+rIQNK+eCdEXpn4KNFv+3+L9/IupLHM YPNDNfr/k9AUnvkVO+vrZ24jG4xYMF7SVTYuOnMkcZxdjRGacmfF0ORWdP6Ah9S3loMxOOS92Tm ky4wcdvZXg4xYanWpj5i6sbhhhf7TN4NuOl+OuOoNLA9DVDPuh6fhZ2KWwKThfzJjjpUKNtNCpm slKU/8V/A6HdtdvLSdolgSCB7WGPVTyYlOJOXpB/GMAeKHkneMvdHMT0K6eTww4xW+ZUfGwWH19 LGohNVKrpXZRNRtauFS6RkqlLnlAb+SidifHvorQENxdoCxjYoom72lkotVcT2slFP634TujIcq MQ6KZBCLJxbMct2pDLqTMdpo5S6lGzYNtpx5YVLstk4y95lJln2rAofm3hl5OKgz/FaD9GhgS0D tJuzR4GigfIGO7IUIBSOKn5rvOTH23M+oHkTeZoe8Gu12Pg+tOj+IY/u5oOaaGlB5bkm0gcruQS xM2CgbknXuYxn+A== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Move netpoll_parse_ip_addr() earlier in the file to be reused in other functions, such as local_ip_store(). This avoids duplicate address parsing logic and centralizes validation for both IPv4 and IPv6 string input. No functional changes intended. Signed-off-by: Breno Leitao Reviewed-by: Simon Horman --- drivers/net/netconsole.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index e3722de08ea9f..8d1b93264e0fd 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -300,6 +300,26 @@ static void netconsole_print_banner(struct netpoll *np) np_info(np, "remote ethernet address %pM\n", np->remote_mac); } =20 +static int netpoll_parse_ip_addr(const char *str, union inet_addr *addr) +{ + const char *end; + + 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 + return -1; +#endif + } + return -1; +} + #ifdef CONFIG_NETCONSOLE_DYNAMIC =20 /* @@ -1742,26 +1762,6 @@ static void write_msg(struct console *con, const cha= r *msg, unsigned int len) spin_unlock_irqrestore(&target_list_lock, flags); } =20 -static int netpoll_parse_ip_addr(const char *str, union inet_addr *addr) -{ - const char *end; - - 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 - return -1; -#endif - } - return -1; -} - static int netconsole_parser_cmdline(struct netpoll *np, char *opt) { bool ipversion_set =3D false; --=20 2.47.3 From nobody Sun Oct 5 00:07:11 2025 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42BF72D6E6B; Mon, 11 Aug 2025 18:13:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754936024; cv=none; b=oTeAa6Z2z1xGFM57Wkxs0/L/5EF2H9S+WAiCwZb71TM/+RX4fnQbsoA27kzlhTM95aBOjC1M/WUyoJ/K5V60s9Xpe8/L0WuHp3v009+dtiqtaPwNvmOpwQJqmzArKL4nUF9oVeww8/1zvWqQYFAW72cowcEv+sI4neJPNkmJQtA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754936024; c=relaxed/simple; bh=wffG3FnXGoTOqKyzZE+G6mW6Nsct3xKRJi9OEVHYC0w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=n/MOUxzGfJzmcf0P5K6Ojp4zi9X02n2MLZiLBy2ADh1kSv0yAKxRcZh9h1FSH6tY0QpduMZmWcC/XQAxQ3RJ0QXG3A78+PF24q8Lu+SWGPcmRnoVAJQgyELn7xyWwTMduvjQpJVBAJ59eR/FWiuxloski0Gr8qG6q5Ww5NdAHYE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-615d1865b2dso6891938a12.0; Mon, 11 Aug 2025 11:13:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754936020; x=1755540820; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DvLC3Qpe6aWWyqq8g7FM4Df5TfoCnYjGX1Dua/xEnsM=; b=FqOqiQvXBUDfTPZEj+aEA0cviwBLXc4pCLeC6H4n75qlXR6XkaUd7uH5Ez+YpfuflO 2/FeEDMhw3m36EwFbE2iggt+Zae/VPmwptQqBUcsUI+518b8VWijW/6kkskoThzvCYTN UQKOGsk+jjFX2LqtmcqIos948LHJtp82hV8XSQvI5nnNEQWaXhylnVoc8HCQDq9wXmPg Od3LAV+H1k3VQ0r3pwh3G8L44rWwQXvBcVEVZ5W7q64k4V04eWDO+54njNtoCEeUTc+y S3mZ8DQF4FOaW6ZczLESvJ5KJhEoHda3R7X93/XeNHZi+h6baYnwRpkOFzwBVu1pkP7f 9qdA== X-Forwarded-Encrypted: i=1; AJvYcCXOjQ887bHiqC6Zwa5b9o6HCoiiHhJ5WH2lHhAIHDCUeXosGkO9OaGvu0gmaDk99jJRmnpkPfIko8MMVxI=@vger.kernel.org X-Gm-Message-State: AOJu0YxEV96rw8h2AJSRkpkRwpiouFqMvc6dlpJydr/vxAUli85lpTmb rpcEfJU11GSXiRWtbNtebGMyMvdop0kofclARRPSO8BP4LG9l5to0LNI X-Gm-Gg: ASbGnctaA04Hs/yaqMDontpZDuvjw4OULxY99miVNAAk4knjH7PUsV4MybqrW0zesuR +KCURQLjSmr9pPTQam/vjWZh+GZ2Ua7Qas50jeQOjicGTIj2aSKVmSPu2HdaOlQI4yiI0tZAxdg IbHClLXkWP3HFj6YO+PHHO79grMvUudCCDeuNygo3aXAjJjykydBhP1gESFmCIqPSrXO5a723pW dIzIcfGKFUkuqtpCaUcr55n/hDvI4PK3BFwqXkJsflYi0aUtbr3WrpKjpudpM0p4gPlCHzTGM5Z XL1+UfwyxVbbTkKx9nDHg0TGXTyQ/kUaTPQHyzKR/UovsNwwQ+dlqtFrbfj8YqsSPZ1i1icrkc9 x/rjtSL9tyTxxqd1tHbPIQgGIUgKmRkk93Gg= X-Google-Smtp-Source: AGHT+IGA3WJgCbNV+wAPymyZ7WBnTQc9uloBr0NaE/FwU+TV7wB97NkoiCndobCIjAX+siBSsyWF+w== X-Received: by 2002:aa7:dd13:0:b0:615:78c6:7aed with SMTP id 4fb4d7f45d1cf-6184eca72f3mr189568a12.32.1754936020376; Mon, 11 Aug 2025 11:13:40 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:73::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-615a8fe7a20sm18930344a12.34.2025.08.11.11.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Aug 2025 11:13:39 -0700 (PDT) From: Breno Leitao Date: Mon, 11 Aug 2025 11:13:26 -0700 Subject: [PATCH net-next v4 2/4] netconsole: add support for strings with new line in netpoll_parse_ip_addr Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250811-netconsole_ref-v4-2-9c510d8713a2@debian.org> References: <20250811-netconsole_ref-v4-0-9c510d8713a2@debian.org> In-Reply-To: <20250811-netconsole_ref-v4-0-9c510d8713a2@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Breno Leitao , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=1944; i=leitao@debian.org; h=from:subject:message-id; bh=wffG3FnXGoTOqKyzZE+G6mW6Nsct3xKRJi9OEVHYC0w=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBomjLQ/2vMJy6snG7KhBlfNfJY1oKh9EyCFhMZR e8eH1Em6JWJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaJoy0AAKCRA1o5Of/Hh3 bRhjD/0XV5S6QH18UZClmhbCtJfZv7zO9a31YFOFqdAuGS4pV0+hGkySIXKYFtvwgHtlh6t2RA8 T18qoOD40Y7snNwAJdSPQXJlDKTZM2Yd95u0le33AA0xlY8HF2F++cjEfp5cLOOhZXd2cLA60ZH joY3iEoTD+8w41UalFIYke53sumXjsSmm8S79yv/J4XMo1RCAjiK3oyUYADu1D5umE26Lkxa56I X2gv/KbZXV3ncMJlsGdAujTd8LuBiMydrUi5w+pYDs9khFZQQqbX7o72afKM0k80dsFqSwnyofT nrmDfCi5nwWcUpaJlrGzWqqy4f4gKJHIX7DvQnawCzFhhjuf7nVBuN5SV1ezc4pdsoHLICgobcw pv1VIiUrCK+QvMBzlLCH8wLWzK5Pxor44OZGyTW+fg6Wt5aV/SF4sJXBNC/OwCdWibccRy7IGvf 9lreqVta10mvq0tPfqp5EoCdT1HPqkt52xDgmHxnLzc3DT+/pu8tpnBPiMKypcLEhGHM/8E8k30 IwV2gOVTuTieYNiJVzpGTmxfDTV+6V5a6TZ3v2yqsAlLkqnFED3E2c/+I0hCRDGffDUdlH3VqFY Al8FiRB2P7UY4M/nxkypCEsUDnpKFXVNDeBsUYDy6E98hl8KRBP8KAHrWOMJs7cCBXrgHlSiDLz CEWSfy8Ouc12KwA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D 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 --- drivers/net/netconsole.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 8d1b93264e0fd..2919522d963e2 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -300,23 +300,30 @@ static void netconsole_print_banner(struct netpoll *n= p) np_info(np, "remote ethernet address %pM\n", np->remote_mac); } =20 +/* 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 =3D NULL; + int len; =20 - 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 =3D strlen(str); + if (!len) return -1; -#endif - } + + if (str[len - 1] =3D=3D '\n') + len -=3D 1; + + if (in4_pton(str, len, (void *)addr, -1, &end) > 0 && + (!end || *end =3D=3D 0 || *end =3D=3D '\n')) + return 0; + + if (IS_ENABLED(CONFIG_IPV6) && + in6_pton(str, len, (void *)addr, -1, &end) > 0 && + (!end || *end =3D=3D 0 || *end =3D=3D '\n')) + return 1; + return -1; } =20 --=20 2.47.3 From nobody Sun Oct 5 00:07:11 2025 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A88382E06D2; Mon, 11 Aug 2025 18:13:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754936025; cv=none; b=iOTzk1ZS1p9ysSMmSLzNy25jPcGu+xBCMe/dN8CNtFXAjX8mEXZAMNdEtyan6VFINiIpE9Y+KrCLJTSsYBKE50OwuGCmAykmQGjkXaqPX6acgXotJmv+hp1uogKRNcTXqRNOmHvt/UjW5YZfu3xL1ovkhEdZyQxtTTTwDriWe48= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754936025; c=relaxed/simple; bh=2RxZv02sO2aOx2TZEIBRAFNt+IxFx4gGxT8mRrKTvYw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SudnaZPM1cjYmBtVmw18OlgOFkBsDfR8/2cR5S3b0XrF6H6iGs1suQrxvhSAkO0aj5Eof6z6So+evH/5+AJLKjz4zTs9UVsVLAHqEWVBWKyI5+DIJjErKfK/Aqw8moVm9ytPkye23vpcPsDbx3PgjvRi1PixCJwHWhPx3NU1qd0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-af9842df867so828001666b.1; Mon, 11 Aug 2025 11:13:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754936022; x=1755540822; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2ODOgtGh0+BpM6WIduaOUCWVOWgR49or9dGLz4zuRqs=; b=U7A2kzdqISO3EDgreU9zSuhPNftwe6Vry4w8sfzM70F/g4l8hhwIlLxOks7SnT+++n xxS1+uP7d8NA9+fAXCmV5KjxMrgcVYioCAuwQEs3iHdJeowgdQMWvqAhezHNYtJXIvQZ at3KGbMBbyoez9Z6XWUQLdP3UrjggDPUmA4EGqAsKEFgas56UuzorOQSoxXjwuP6aWGV mJt+7/jVc3DXfM40BpuAoECI7Wz5UCpFw9/K2BLJePxuUH4idY9XXPRl7civzvBkaLPl 8pdSWMsEf37L9ypACVb8/Z0/GXnEg49bWQzxGCRa5esd/DFNfNyeAQn4vGkw09LfFM9j dQFw== X-Forwarded-Encrypted: i=1; AJvYcCVmeEgAA/0Xr/xlPviY4BMwkR4ZIYTh8/aMkzyH0CR34a7TPtdGpN3yXbA3Gh9Q1CDfBdmv/DbWAT2lVOY=@vger.kernel.org X-Gm-Message-State: AOJu0Yymv8FMx16dlYaYW+Grp+Z+ut/wKcGIedKZt5uJESVfIqXj1Uil UiYAV8DcBIpTSHhfnaEV6YjZpv4IMcqZBS99NsEdudGK1eFz5EevFn2x X-Gm-Gg: ASbGncvDQ6xoNB8icXSyrnCCzgjbgqlRQGxT4AyjB8NK2B1jYeB1MC3ob+PvitjtMmO 46h85NNjJ8TOI22NMgRxyaWGZryzjNuUasUaQzHcm3yivyUKCBuJYjYRnNn4iuyNeClFcF9tgno 2BRtWER0biMH9xSQY4H0W/dNY0t6AYXXMCgHM2NwOB2xwapsgQEfQvm9I1aneoHfNl3iAEZwHRD X/YZdJKDTbckreIA9KOJcQz2iIuE5+AGb0jZa2kYMtvo02JzBmB0tl27jMGFVH/nObZiKAJ8LW8 FTqEuKS1dEhCBNKFq4PBZJQDAvzjiiE4cLxP7hVGlKAwROQi/5DXbRBP0T8QfMYLCGw6x8vsgKY HeysguBd+KnlUkCMsVyoTiiTvHE3T5lyM1A== X-Google-Smtp-Source: AGHT+IE73uPsFKgQFOuk2I/rTanhn0eQF/dfkFMZhR6zi+/4PB8Bhp3BOw58UntXkTAaU4cwAZneiw== X-Received: by 2002:a17:907:7b8c:b0:ae3:7255:ba53 with SMTP id a640c23a62f3a-afa1e14e79dmr39503966b.53.1754936021864; Mon, 11 Aug 2025 11:13:41 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:4::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-af91a1e8332sm2062371366b.75.2025.08.11.11.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Aug 2025 11:13:41 -0700 (PDT) From: Breno Leitao Date: Mon, 11 Aug 2025 11:13:27 -0700 Subject: [PATCH net-next v4 3/4] netconsole: use netpoll_parse_ip_addr in local_ip_store Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250811-netconsole_ref-v4-3-9c510d8713a2@debian.org> References: <20250811-netconsole_ref-v4-0-9c510d8713a2@debian.org> In-Reply-To: <20250811-netconsole_ref-v4-0-9c510d8713a2@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Breno Leitao , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=1683; i=leitao@debian.org; h=from:subject:message-id; bh=2RxZv02sO2aOx2TZEIBRAFNt+IxFx4gGxT8mRrKTvYw=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBomjLQwyx8GgWXnKc1005KHfxs8GKKeQrBQ0GBe X94AXjvi8eJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaJoy0AAKCRA1o5Of/Hh3 bQ0yEACbi/dhp08sUuJyhCvSTOC9t7TPjeV8RlxQhFsPChVxXc6JfYPkXaRxN5nUcLYcpSlFsZ1 x9OcC+t7ZEXcTEOGXRROTyUh1P4020RZ6F1RKUl+cVuabMg8JWXhWEwJIkrFZHkpFQL1k/RzQ35 ufvyTdmGSl5irenbcCXR4lml+wndj5YXG25C0Nm7z3h+9ZsFnEjShvLmnLsG9Xbn8skM8pwdzKY ToZZzPer7eIMGen3VkIZrputNEqdb0P0peqJ0oc7POxU7jz5sD3dR2n98oZLv6+7nmHUyVTkROX R+xhvOGS4nJnQZHrZQtR0Lm+KHVyBMFfQziGdBTOiIgvBn1g0DS3j1S0dkrxYD+33WhwHBiKiNE xs+2D1ctjqYnUAY1k7rq51YjFee4R5FmuXN/ueGl7nz4HNSSMzJw62axqgKY0IJN/GcDAGec757 2zhjycLhz0yZeVhstP6BBWlTsVdZeEt3T7J5zKZzsyoci94XLdSNumYP6vYEaj5LZoHyicPrnow o0COJIahHIJcMrvo976E1OrQeJKFtLiP9NtviwNDW9Ym/vjimW1hC5cngEl2FjcdAZm+QQmoElP 0BJfV988L7GpV+9w3z6hzRZnw249SarlvEqR4WwPWjByFllVDh7F6TKlTIR32UsDEsogPREHlbB sTZBj0hndHks7hw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Replace manual IP address parsing with a call to netpoll_parse_ip_addr in local_ip_store(), simplifying the code and reducing the chance of errors. Also, remove the pr_err() if the user enters an invalid value in configfs entries. pr_err() is not the best way to alert user that the configuration is invalid. Signed-off-by: Breno Leitao Reviewed-by: Simon Horman --- drivers/net/netconsole.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 2919522d963e2..a9b30b5891d78 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -757,6 +757,7 @@ static ssize_t local_ip_store(struct config_item *item,= const char *buf, { struct netconsole_target *nt =3D to_target(item); ssize_t ret =3D -EINVAL; + int ipv6; =20 mutex_lock(&dynamic_netconsole_mutex); if (nt->enabled) { @@ -765,23 +766,10 @@ static ssize_t local_ip_store(struct config_item *ite= m, const char *buf, goto out_unlock; } =20 - if (strnchr(buf, count, ':')) { - const char *end; - - if (in6_pton(buf, count, nt->np.local_ip.in6.s6_addr, -1, &end) > 0) { - if (*end && *end !=3D '\n') { - pr_err("invalid IPv6 address at: <%c>\n", *end); - goto out_unlock; - } - nt->np.ipv6 =3D true; - } else - goto out_unlock; - } else { - if (!nt->np.ipv6) - nt->np.local_ip.ip =3D in_aton(buf); - else - goto out_unlock; - } + ipv6 =3D netpoll_parse_ip_addr(buf, &nt->np.local_ip); + if (ipv6 =3D=3D -1) + goto out_unlock; + nt->np.ipv6 =3D !!ipv6; =20 ret =3D strnlen(buf, count); out_unlock: --=20 2.47.3 From nobody Sun Oct 5 00:07:11 2025 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E47E2E0B73; Mon, 11 Aug 2025 18:13:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754936026; cv=none; b=OyFg6DeChdDdMFOmnjKL6tyyUdyrB0BELfxJsqpr6WIi1BMwNJphIjqn0tnJRHNeIg4bJlmpbTDjxDQyqs1uR5ahEI3IuwBcFMQrNameKI9lfm5rYeVEUrby8G/z6ydjYwhfBfz07wS9V/1Ks8hDLk5qydzD1hY6maTett9m3x0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754936026; c=relaxed/simple; bh=TYuHsvzHVOr+9PvIQi9gEgWUd6z1ZxvE9ypUBBhqWyc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JNT4/sa0d3JzmK41eD3q1YiPZoCuyOgq5h728+6tIPaLdhvEy11rspVm6FKupGG6pRmVWjmQW3P+tF7H7Dp5lZholonxegVlz8z6Nq1gYBGqv8l7MgBBhser4B76lBCWsXAxmRyIUB03qNiQHAPXcmsrHCa4De5OWPVn3ujPvLk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-af90fd52147so705884366b.3; Mon, 11 Aug 2025 11:13:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754936023; x=1755540823; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VlANYRkx09sjmHv9uIlhrUyb8IuPz3ei9Bead1UID0U=; b=PzZ0m0bofIPH0ZTu30exyfR6I1yEDDL1CETi68t9+LMsYMrMhrDGGtS7pxuGfKB3K8 1Tu+TzL8CJ26mZNzxxl7ilZZzHDJ5iLlwv2vzwX6tQC5lYQ+lcylvGksPuRGkeWs4Oyz /Ffihf9F6GFHQWTsaRhIEHgOz2Un48Ny+M4QD3OpJHredAsDQNnPn4gwPd3pdY0uzs4H N99JROaY2afOSqYgxv8HeqOP1D6Y9P6P3L9mGB2VEv1qDAP3vHh4G1kgNZah+yZs8ZGI ZS6oUoAIHTc2RUj96ReUysIRz9rXigAv82ubINIKECqnRLLT3hIb47gEzgdpumoaCzoy osfA== X-Forwarded-Encrypted: i=1; AJvYcCX/Vv4nUAx0wBdETQq7pvO2x4n4oO0AzbEwxhUsK4FCV+X+d6s3oqXpH6roHXBMeMiLca8E9i19vx4clQg=@vger.kernel.org X-Gm-Message-State: AOJu0Yxc5kvwQv8OEoBO8Mr19UbY5zxyQW3iFoIUNbUCb+qAhOiIArPk saExDYpWSIjLeo53RpeCJE19+ryyjmG87bYG35T6QY2yTdMWfRQvJzxt X-Gm-Gg: ASbGncuWpZ1tpx++hWrINmuy7iYAQesvkuj/ggRBk9YpEywt5j/y9xRcBtiB2+i2C// LY3ZqUw4/NufgasWDl4NxsH5Ris1yt2/H4G0BKJcOustrRovsAZ1iuhnYI5IK/HiaFy/5q0k+Vp llgaLGOm5D/0JWRJrOQZOoil3wYCEkMRWnVyHfb4J6XIu33fQHda6PlP9tOIJvO4JjZ6KxhqCMS SB3Zll8oYXbiT+1BNJiN58zkEOM4vY4kmahQJXg8vRMxlL+woWZJF386K1E7+/JPDNCrlEuvT62 FO+1T8nUbmW9isdiCqtBgGGw5siAodg59k7QHDL2/FHbDN+WikbLIuBVY+zTLAXhnPjMo8C6fp1 joTlRq1JoeO3c X-Google-Smtp-Source: AGHT+IEERT7iogdm51K8PLVxGdGK7NUkoPv0Da4E3sTjfBoYrWSCEnt1emeA/S8OJ4YyvhG50pGJxA== X-Received: by 2002:a17:906:d54b:b0:af9:2668:4c36 with SMTP id a640c23a62f3a-af9c6518c38mr1431441166b.48.1754936023337; Mon, 11 Aug 2025 11:13:43 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:2::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-615a8fe77cfsm18800092a12.42.2025.08.11.11.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Aug 2025 11:13:42 -0700 (PDT) From: Breno Leitao Date: Mon, 11 Aug 2025 11:13:28 -0700 Subject: [PATCH net-next v4 4/4] netconsole: use netpoll_parse_ip_addr in local_ip_store Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250811-netconsole_ref-v4-4-9c510d8713a2@debian.org> References: <20250811-netconsole_ref-v4-0-9c510d8713a2@debian.org> In-Reply-To: <20250811-netconsole_ref-v4-0-9c510d8713a2@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Breno Leitao , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com X-Mailer: b4 0.15-dev-dd21f X-Developer-Signature: v=1; a=openpgp-sha256; l=1642; i=leitao@debian.org; h=from:subject:message-id; bh=TYuHsvzHVOr+9PvIQi9gEgWUd6z1ZxvE9ypUBBhqWyc=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBomjLQS8H8diuPCc3a5zukFoK3EhBNB3Wu3DSpE kvXJWj2BvuJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaJoy0AAKCRA1o5Of/Hh3 bS/SD/9gACcc5OGWQ9svWr+LUgWerkwdaIJVa2OueKkyZtZZpD+JCkNNJNlBOMpFxZnRJVJJ+Q0 izDrfwZTSekf3RtwDLoJdU/HujFA+Tw7oFt6QqCR3ArjRw60nC9oIDOi5ZmZVukbpnEKUxVhSUp AFWoJcMgGclvqVS9Iq0Eru/NEy2J7tTrjXVXIxHDeZO0h6PrRa5JG6aTSuFvWwBvsFT7J6TfSQH 6O89sUVXfaC3gmMgL6ezpgknZa1C2C+7miYf0HoCK/WxCiVzijgxV3rT+tBiygIjUw/ALtPmqvE a82Be2W6mo1q7/DuqChitkQ30UM/YvwVgH7KDoMIpuJtoRswQKwkTE9+9sLHu/2sS8rZzqIhtaj LzPoxwjEaCQ2WH/VCxIiXk3ZyNqj0+dqikkXChF8Qvc3j97/TiheLKwvKOIp0GkCXu+9zfm2X3t 70N7vSMH+cRkDz0167GBfhIpT++3RVx/qU8IFCtgDFFwuWmt0iOl4cLmAc3XjLa1xb3USc5yXq2 /uUTLyMjLPzVwJD0h9hQTxqSpcWxluygd5sFm6wz68mvGpqtpozYYQ3WfWuDT2hiUfqIg6PI+gR zAvl6PhPX17MUkOUGumAOO8jSZiQq535RUaA8S0ZX8u9XF5sCNw18CX31RMmV5b7WHnC7MZ72D8 3maX/RkZrwqKwTA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Replace manual IP address parsing with a call to netpoll_parse_ip_addr in remote_ip_store(), simplifying the code and reducing the chance of errors. The error message got removed, since it is not a good practice to pr_err() if used pass a wrong value in configfs. Signed-off-by: Breno Leitao Reviewed-by: Simon Horman --- drivers/net/netconsole.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index a9b30b5891d78..194570443493b 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -782,6 +782,7 @@ static ssize_t remote_ip_store(struct config_item *item= , const char *buf, { struct netconsole_target *nt =3D to_target(item); ssize_t ret =3D -EINVAL; + int ipv6; =20 mutex_lock(&dynamic_netconsole_mutex); if (nt->enabled) { @@ -790,23 +791,10 @@ static ssize_t remote_ip_store(struct config_item *it= em, const char *buf, goto out_unlock; } =20 - if (strnchr(buf, count, ':')) { - const char *end; - - if (in6_pton(buf, count, nt->np.remote_ip.in6.s6_addr, -1, &end) > 0) { - if (*end && *end !=3D '\n') { - pr_err("invalid IPv6 address at: <%c>\n", *end); - goto out_unlock; - } - nt->np.ipv6 =3D true; - } else - goto out_unlock; - } else { - if (!nt->np.ipv6) - nt->np.remote_ip.ip =3D in_aton(buf); - else - goto out_unlock; - } + ipv6 =3D netpoll_parse_ip_addr(buf, &nt->np.remote_ip); + if (ipv6 =3D=3D -1) + goto out_unlock; + nt->np.ipv6 =3D !!ipv6; =20 ret =3D strnlen(buf, count); out_unlock: --=20 2.47.3