From nobody Mon Oct 6 17:02:01 2025 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (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 87B942D9ED7; Fri, 18 Jul 2025 11:52:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752839538; cv=none; b=rgqgB2tkqA64V3VL3jWfmeD5zziiDHBU6CZT8qfzCm2/EQQzE/whoQldIifCTF62i/GOKPCbiOZseFHsreCAoKr0hBIgcaHHG1wlt6IFV0D4DSIsig3jCjp6xj98T4Wtq5qIQo0WI+/KwNByjiKajOso2QV5jZjd+c94H3TtTGY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752839538; c=relaxed/simple; bh=oagYvLPRp2ebesljFuBIVfa937xZLmXWPbPvbJX8Vb4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=J7vkrZG9448RYN/ldhUs83vLoGxJob26jfC0mFnr/eltkb+riaUNSIqogjCNaoS4ECIrouIXB5o3aLC9aAtdpg507+LvpCLDrW9elmA72AXHPJY6wxfsTwk8kennUw+4ksdd8yCYeEy9sbBEGz3ixI5ja0vq5HaE05X7Nxgm68E= 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.45 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-f45.google.com with SMTP id 4fb4d7f45d1cf-60c51860bf5so3572520a12.1; Fri, 18 Jul 2025 04:52:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752839535; x=1753444335; 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=BsLTxz4UURCNf6IGkttLdx17vKela2kG3TZHARmy8BA=; b=ZCD4ob1o+5Kf+uCjkr3eh/NyCYZhPNyV2TJ4aeLpkRe2vP7rTrjy9F+8VDmB3O1SgJ drk12+b26BzZQbZKj7KrB+Aw3/Um4MgBSi5dZZN6YOthJ7vOsha1iF8VB/1dNs5+0Ev1 4K6ttcDdCDyBdvU9bPvZcxwM0LyebfVzgE8sv4dJUuF1qND93M9msq1MZy87R4K24LBm I8X1yU03Bd0w9kVCWm2RBQmuJqRKeLq5sprhsPUB2vnwiQoasaio9V/9Rbt9ZpP0BZwU 5fYWmvhk/wjGq7fnQIm+L4X9tKHznHdZ8+kCe5FysLB8kietaGcL9rMI8A2PAXFgCpfI mFbw== X-Forwarded-Encrypted: i=1; AJvYcCVMgBUxsUf+Hbz3oGoD+2bYkERPmQOQMqwK9mxaMsLH4mVSvyQTyaopLsGDoHVC+YtUUENH7HI7jEG2Yms=@vger.kernel.org X-Gm-Message-State: AOJu0YxfLpKQ1YcjwURz2/jFQz6tH8G3zFT0OGec2PlDkAqCRXtMRPYu jMeMLkYYWLOZ49fKMuZCBf/nSEEXMWQO/FygqKC10jcm9fj6lLxoF+kE X-Gm-Gg: ASbGncu6aH1BTP48lwRWG3EGEIuQ+i6zmjW8Q6pQwnGgWoNitxOMydqqVxHGXbKxQya eSmTiOGg/FvkSpQ/+l7GdgSib705VXm6KFpgCRUTY41nLj6u5aWNMbgoOEL7UXygz0BGC/FmJLy M6/2Wlscf56gElfwH4MP7qzaXD2yTZze8x+jRPHSEMJA9izFXZcbk5YDFxcq/BIZDIQZT1nNTJ6 CYjPxcERX7LflPsmrrWV9/mF0o++flIJhnhNYMTgdehY8gJCzDkAMR7Bawndll++oFpWsFQ8CSt HdpkaRJ/d+NdUhSSAALlvUjHoOMnhgl3HTziZGDvavzp6QLHckfAK0/2wpP6GKXqp38d6Ba6zDu YYmjDyGsGRxLTW/HN2DHVn4Xy X-Google-Smtp-Source: AGHT+IGjnXf2z0qwBj3yHRhAXXXCizvmwyzUS2jYmaauRD+o7hnGPU34FyHP+GwXPEwDwG6zshPBJw== X-Received: by 2002:a05:6402:84a:b0:604:e440:1d0b with SMTP id 4fb4d7f45d1cf-61281f1db60mr10195225a12.4.1752839534581; Fri, 18 Jul 2025 04:52:14 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:70::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-612c90bc80bsm870521a12.68.2025.07.18.04.52.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 04:52:13 -0700 (PDT) From: Breno Leitao Date: Fri, 18 Jul 2025 04:52:01 -0700 Subject: [PATCH net-next 1/5] netpoll: Remove unused fields from inet_addr union 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: <20250718-netconsole_ref-v1-1-86ef253b7a7a@debian.org> References: <20250718-netconsole_ref-v1-0-86ef253b7a7a@debian.org> In-Reply-To: <20250718-netconsole_ref-v1-0-86ef253b7a7a@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=714; i=leitao@debian.org; h=from:subject:message-id; bh=oagYvLPRp2ebesljFuBIVfa937xZLmXWPbPvbJX8Vb4=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBoejVqTf1QOktqecWWRvxZqaKjqAVseRIY868ky La3rNJ2JruJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaHo1agAKCRA1o5Of/Hh3 bSm7EACV72/mGXfANRp1qGgo+rOzxSe6Ckq1PFep0rln26Ol2rLJbo1pQvws0wlpDIRJ/KMIZUG 7IIUmkZBhS3IK50ivKJl0EorXr2KO3JSZUgeMZOq3DTTEIsS7GtrKgMt53jDiGIoNSZN20nzpFB xE3sxmx/1LhJ0HqL8ntKkFTO5+4ypYgpwg1D7YblNe5Axdbhz9xeJMKjVt2+3qg4JkpDTTwzCc9 o6wgaEm/p4Q9olJ5BtzXZ0bE6xeI/xwQ/4ve9auaDpNBNOnFdFV5m+GzKzSHCzg6UBL0FFwyZMC LS/N1lkjo5mKyrfABJvuDp4QiAaysBtsdIOr6yyGQGxOVTUA/RVJX5BZHu9K8Hj9ADGvdBTsHVq uXE3wSSUJV0uCMV9ffPh2ty+tumiIf0nqhQZJejHsM78wgCvE4IVn6y9n7tK11iIki0wS24UeK2 3I85ca4lgH2wm7N+xOZlRS5gKo35SxrJlcBTEdI/fkTg9jSLzsS7ilC8BwB19sVNkIQdjqLhupU aUBYMHGJBIAMce0TGaFgtbcZ3THwJsz9PLU7Jkdm8a+iuiqx4u8NuuGVgYjGzBHlS0Ft0ss0C64 5oSZXuTYZpK85oUG6GBJH8EStP41i8HxiOiQFQI7MnkHtSJIGLmBu/2qQIiZ9ThJqwTAGWF1n7Y EXQ4GsLv+PtUXqQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D Clean up the inet_addr union by removing unused fields that are redundant with existing members: This simplifies the union structure while maintaining all necessary functionality for both IPv4 and IPv6 address handling. Signed-off-by: Breno Leitao --- include/linux/netpoll.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index 735e65c3cc114..b5ea9882eda8b 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h @@ -15,10 +15,7 @@ #include =20 union inet_addr { - __u32 all[4]; __be32 ip; - __be32 ip6[4]; - struct in_addr in; struct in6_addr in6; }; =20 --=20 2.47.1 From nobody Mon Oct 6 17:02:01 2025 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 4A2042DA75E; Fri, 18 Jul 2025 11:52:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752839540; cv=none; b=fMZjAea8L8qB8rjs1Z0EN3zHkOMV+3NrD9e+sAjYxuZzETkSh/pI634eBHv8KfeOghj4HWyI2jeXnUhbOKWCz55taeGD45boEl1lfTYWL4JGtzXN+zNt4ayw+wUOXtOZmFFRrvVAVSj7mje4k8MtBtx8I0tZKU5M96LNntVQ2RE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752839540; c=relaxed/simple; bh=LXKhX2xGJ1XURDACwlP/aaNOyFrwLxfo2adz710C7bw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ujutOnZb3lLdZybN2sR7Ach1gqSqVNqldNAnRXpFClThD0cvDGclR+5Hg3WBrb/5CPUwg09MOdbMYXnKPfXIcsN9nyW4ncwWi2EkqjnZkfke77sRR4clfAyOlODLG+QI4NnO87ieHxDqYPlkp0MTcMFsWitrsiAj5K0UimxRqNU= 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.50 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-f50.google.com with SMTP id a640c23a62f3a-ae0e0271d82so357459666b.3; Fri, 18 Jul 2025 04:52:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752839536; x=1753444336; 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=U7+8Ag+vFn7qJNVgKf6C+5RLYQ3PejsKZzoL2fH5p+0=; b=Xd4WbZ7340m7/VaMsTZnBfeY30pvH3Bq9QRiensDE2zlCZM0G1VThJo4zyUFqe4aBs OymOuFUj8EWtvFeBREItk8WGu8gDvTRqydTe02LwrTEYSdMCcDVIHUyEaLL30oOkfRRG RizAy+eB5zZj1IfWGX66XOtj5MMwbZJmsJDbsDpWFNioZCxpcu1Ob84ssupbv71zC88E DToCk8o8U8NQQJGHVCv7XZ7AGaA648Bp29YqOq3GHIrYajV84dqoqW+ZAoiul3SAvHLC d9PED8CFRW3B/C4yblmWpG0N/+27C2SGYIvGGSTPffEVlD6iWELJ7Q7qZdEGw9VYStdj OCBQ== X-Forwarded-Encrypted: i=1; AJvYcCXmctKruBsRciW+U1Lc2Y9q85M8hc8s2ONSBEMr60fVlT8DHShjr+6exyrP6O3tW9hsBB//Pl7domw7/rM=@vger.kernel.org X-Gm-Message-State: AOJu0YxOXP0JqOctG5WTrRfRi2ylMCvemAHKUDz16ENDuKYdFf+DF7Ti gm6NlgjuZWIMMoHTJEtIcCIGvW8cCrBSS6oq2DNOoO52dWniNe+9+8KG X-Gm-Gg: ASbGncvOzDsIXjxF3Lb4llN9OLTMRQGiOjnHxRGcCWBvGWjAS1fqWyRjmC3Swm30zGZ OTnvx/4FczUzbSvzX9Kqz7NfujsBYaH8Dv9OWUb78JYEWlXdjOXzAWk8d4E9RWjIfPovn1xBCfj byB/6LGOowTp/d45n4XoqV+87VooDzfLSlXcNmp7Y5LnpdNVr90wj/3tbzF9JLuQnKPp7CbJ6DD +pRPAmYcXv/SKSPqWITfG6QDz9KkxLyCQorzIIXr999OZ79X2VJ4aTrllHHubebSyKRX0fgxOGj mQG4/DsBMP1k/pcby5mLHFoVjyQYHbGhG6EB+UvLASTcUB7146Vg3FdFA5LIMb3XQ/2JVnXG5en l2KoZpev+pL9T2CTv9iynH30= X-Google-Smtp-Source: AGHT+IFQqT50hIcvB/p8HVTE3B/FX8glm4Qyni1GKc0QBnNbNy5/VRtzg4CCdiWzNEuB0dIyvYbGow== X-Received: by 2002:a17:907:a904:b0:ae3:bd96:78cd with SMTP id a640c23a62f3a-aec4fa4387emr695648066b.7.1752839536059; Fri, 18 Jul 2025 04:52:16 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:9::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6c79a056sm109299166b.14.2025.07.18.04.52.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 04:52:15 -0700 (PDT) From: Breno Leitao Date: Fri, 18 Jul 2025 04:52:02 -0700 Subject: [PATCH net-next 2/5] 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: <20250718-netconsole_ref-v1-2-86ef253b7a7a@debian.org> References: <20250718-netconsole_ref-v1-0-86ef253b7a7a@debian.org> In-Reply-To: <20250718-netconsole_ref-v1-0-86ef253b7a7a@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=1854; i=leitao@debian.org; h=from:subject:message-id; bh=LXKhX2xGJ1XURDACwlP/aaNOyFrwLxfo2adz710C7bw=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBoejVq4Qty917MxfLHcvA3jRk48xQbOhVp3F11l z96/3FKLl6JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaHo1agAKCRA1o5Of/Hh3 bcg/D/4uUNsQPuwAXEkylfj1lHmW4Wneyc+dWfoK1B0sAx9/DgFy6jfd6xQjqT1FuYsQ01r5qQi Mu14jYk5O8Qm0q1/iBlAYhZwZgWNnZsFt1UdtMZNxFEUjiLjfK2nxy6oPZePOKIc1yUqKeiIn/2 xkez2ZrFGMw7K/23/4OEzLzyvmFDjy/qUEnTFBO4OoFi8UogXZqid3x1IVvWaCRTSlKzAukbNAK YgIJ0CQgjQDO5UxTHxrsLKtQE2Iq05UHGkD5rPHRL84iWYtGBaSBCcnkXWZvvuu8IZ6JqUtqZwH zfli8OOrC1IIwna+7PhQVEZLJ6Wc03o8Pd3n4b9W7ojAf6TZ/mS1uq74zBDUmRpRQi02q0QQi6g VudIS8q8gljZTNZyunItwMtkNh52hPl62kVm0IckSjSK4J7j0Tu4sgqtBME6iL93hxQB3Mr+RZY dOYnFDLgFerLFmP34KLZLIoxfuX1YkQaSoAKa1gLt+tbLklUbw3B+C8+uyE0UivDxvRxwU1K4Et g9+La5mF+sJivyZ6bG8ZkCCKYsS9F++wu4LOyJypIvVswxKJnBHZeOmiGo1jaT0IJABlRRB7jYf du7k/t5Fg5sy6/rC8dMxDGAxxtOjESJZwB6bdiKoQCY27Kn7NrsOcW+Z4d9Gh/LCnBM2Z7xvc1j b85LQDBOHxBw1Ww== 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 --- 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..be946e8be72b1 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -360,6 +360,26 @@ static void trim_newline(char *s, size_t maxlen) s[len - 1] =3D '\0'; } =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; +} + /* * Attribute operations for netconsole_target. */ @@ -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.1 From nobody Mon Oct 6 17:02:01 2025 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 8C4792DAFA5; Fri, 18 Jul 2025 11:52:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752839541; cv=none; b=bVhZBEHaRQVoZvag+cuHE4/qocs1ZuHhYb+TgvLgHP5A0ZhJHrhLgoFsmo7cYC5b8k7zzXxbMWCm5jdQQ79ENT0Ds6OVqYfXokEnHuFA78Sbnwq2X9IHuk8x1olls5uU2BOkfq7pK41lmJV5ZoMWwXjAerKaGOFw5T+fk0Qsg50= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752839541; c=relaxed/simple; bh=IMfpWIVzwNE/CautlO4cDyaZHeGdlClnmsL7yApRzm8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TfbyhWegZyoLYRc6OhBmVgvI6MtL4kkQTuL014Y2PVOt0gFJQdAhne03whiDNk/O1ngemWG1GAtb6XCzOJOpCG5CBpza2c1CadCx43bQnpBPvXz0d+KjzFWukBjK56vWDnLBcTu6+dYdojxQD9yFptRgonThhXgUEU8hWRDwXXc= 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.49 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-f49.google.com with SMTP id a640c23a62f3a-ae0b2ead33cso351294366b.0; Fri, 18 Jul 2025 04:52:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752839538; x=1753444338; 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=q+h8p6sEGFtr0FceQPsI3sO4b1Oa9QuYzPZCWPb/Agc=; b=t42/oytBPyfCnO/Dytj7X8GwldG4FJ0fb21cYThzdamqUrt7PhDqo5qie4KZvCbbWP DEKHH+jzNUrn7W5WReLsdzeHxh5z3I4NMi24ZILOww/tGdxODFU4RqATuD3AHSzeVBN4 MHF66z0wyh9t/pQF8JJsZTfAORwbvOkI8TvDOW+Npdt/rO8XhdKx/KfSA4L6Aq1/7Z+D 558H0/edmQTXL2wVZeXGI29JkcyFzfdhoRIlFOYqRjnkW/o00DlDzjpexreJKwx51nAp K4G8T5wVxumWkxoaLt/Lf1ENhO6Mr0omnlRpvh3aufoirF0s6ZpuOfn+OuWq6qUGw2UZ /MOA== X-Forwarded-Encrypted: i=1; AJvYcCXOQ97DkiuER/fxN4AiatBYnyEyGOQb+OUbd0Oo1l3SsyorRaXFyIzr/dFyqUQQ8BtxfBH4uYlicazEssQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxpsaKhP4Aa/VK4hkDlCBhQ1Yd6bW0xW6Wx4dDMi9Mxy5TFPLTp L1LON0pdPV5Njsv3y2sdK0r5Mkq4dtoFw9pjFPGTRlgWgSuQB5pjB+t5 X-Gm-Gg: ASbGnctizRFbDz0P2txCxDlb6r17KBDGNNigbT648rq8wf+jz9UiO+2vrZ7l0DlA0W5 yUBjp/zBMeIFUWE1Kx2rvegjvogQZ6xWCFCkISfLCLa3ZOe1TdMIuFvbSdlt/zM2fgEDtJCOG1t ps5Gn0ievL6iw2ZQqGY0s+twna3U4dKOPoVKBVjapk2vCUBhwfOh6zDyQquled8scQF+LgVY+hK OfYX+seYssp6XYhP18bhlbrlQxCq253cCYm7mViFyNcb1bLiOInCES/IXEVMmlaLOwb658IW5Kn nMKjulHp92dx2NPCSTZse9u7DiKowpoqsE6WheTjZOUBYcPqT8QUaIAK5ukeFnwY5yTANvisSn9 awW5SG/ymjv3n X-Google-Smtp-Source: AGHT+IEAygu32B4TQS5fBN26Fs9PDr+Fd01yTcicqF/h1rLiUp04Zj1jztpcBFGKAOV9vGYWpGTDHg== X-Received: by 2002:a17:907:2d86:b0:ae9:cd0a:5827 with SMTP id a640c23a62f3a-aec4deaf092mr654005966b.20.1752839537516; Fri, 18 Jul 2025 04:52:17 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:8::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6c7d46ffsm108722866b.42.2025.07.18.04.52.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 04:52:17 -0700 (PDT) From: Breno Leitao Date: Fri, 18 Jul 2025 04:52:03 -0700 Subject: [PATCH net-next 3/5] 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: <20250718-netconsole_ref-v1-3-86ef253b7a7a@debian.org> References: <20250718-netconsole_ref-v1-0-86ef253b7a7a@debian.org> In-Reply-To: <20250718-netconsole_ref-v1-0-86ef253b7a7a@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=1586; i=leitao@debian.org; h=from:subject:message-id; bh=IMfpWIVzwNE/CautlO4cDyaZHeGdlClnmsL7yApRzm8=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBoejVqy3So1+x1j7XK0UhNrX2J1Qg2qbPyX7HV4 5cItbY77iyJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaHo1agAKCRA1o5Of/Hh3 bXHdEACQZp2jQJKftx67h4D9lE2zLsxxEYw3H0BdII6RxeKM5e7JeYSuND3vApKrY1HmryqwM0m n/vEn15t+jRrHAb9kEuNn8oUFFdgwvq0VXYRVfzZmIZkhuffTtCp+m6AMLwTNAU9lUw8BusNt10 XSwpYBLkRMCDAN3YTfqE3l6wdbGaukk7J80KbkfacmaKrMMvOSQ3y4pkWxZZzTZsxFpX8l6rQ6I FOtp0qvzzzwpjCu8fmBDxWrr3zjnpFksgfdg1+GSsbzhgeCHyEX9cd9JN6AKlB8Gh3BiHC7g1oj IfhcMF7T/haRg+mZLEPA/gkm1IYNsp59FL9V58NEsJwPJDk1oF192LApHKRGP+tH5cPTH6b0rSE wbkxaJfCoPEsOkFOxMLNAmJ7uZ7R/WCX4XEmuTbToA2KkuznjM1IxVibDU3p7orJcmNxPjCB3R1 BjuOris62fpRPbCbmXCYWdwxGHwM5uWdEpc4WujptdgwjL90dstMTA9O0S337S1h1ekdwKvw9w4 C3nzbar8QzgwjxfoSRdfT29YkQ7BxW5mIx+VJCv0ql0tBCiz5lw94Pdsav+fEdZlaXdC2dlQKa9 roWuL9g7o7Q0T72gsp0hhOw8RJ3anyibqoTBTvDqxLkc1CJLPqLitefhLwpIUrxR1XAaO4RVlSN 1MitWVUADuFvUjA== 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 | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index be946e8be72b1..7ea265752e021 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -363,20 +363,21 @@ static void trim_newline(char *s, size_t maxlen) static int netpoll_parse_ip_addr(const char *str, union inet_addr *addr) { const char *end; + 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; + + if (str[len - 1] =3D=3D '\n') + len -=3D 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 - } return -1; } =20 --=20 2.47.1 From nobody Mon Oct 6 17:02:01 2025 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 24CB12DAFD2; Fri, 18 Jul 2025 11:52:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752839542; cv=none; b=Bax1cw3z9BJkMhC1eEr6LNqHT4pCNnBSeeOeCb/d9aCTIL2i81gVHv6BON2CehAW9NrRZRxYJt5wFAvnO7GKuCGC6ckl5hwCM1tPb6vXTRslhoV51HU/yuEzocRGWjoF/JoY0xwa5m+NS8a7Y2X5zHBHI8KUD3Pf0fUyrnHZw+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752839542; c=relaxed/simple; bh=tkg2bjgERJF800sMkU9QziteGVriZ7Ij2VSeuqHCCWs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lBQ6hbtS/6FOsX+HgzSJkycWIgtdYue7D/x8STXnsZESKCWsgllZy7GmOb+7cooQiFxW07+BoJ4wb9jPchzUOqXpQekyPN6w8ZXi+cta3BBPb2UZa/hSxmi8hbc6SjghFxK0FK9aoHUnMya3LpximZGXGho1XLu8xMeySOcF8+0= 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.45 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-f45.google.com with SMTP id a640c23a62f3a-adfb562266cso330219766b.0; Fri, 18 Jul 2025 04:52:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752839539; x=1753444339; 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=NbafC6s8Z9+DMd3ZcAxF/btYBQ3dbcafQYtJ1Hk3lNk=; b=kW80RVDvWotO22oH2Il39akFmx4HGr1mUT1RnJEPJaYkTMNpIBygeAA1xvr/vcQyli 8JWuFXY9ogIfr3tbneWeRfx/boFVxEvc3YvPlp1lIAkK91x0jaZKLha4hmMz6LG4Wuxo P3u9h3X4xhN/z6uFWeo+seEhz4QfxTfKZY9e5eEwqIGVT0Q4zjFbGsNunJ3eODUNxjUO XcnDCjk6tebBjLu28/9MgT70yzx1CNbqSU2PQZGSurcHMGn+9GII6Vz+LCxYVnXaK8u6 FILGLI4ymGukBnUpLS7/29XyL1jCXXjBsccit0DXvbLj16/T2iuuJcYy+uBW8+fdOrtm K3kA== X-Forwarded-Encrypted: i=1; AJvYcCUXUiYrEs32mpMp8QwmSMeggdqkuVbMUn7dYftI+me13ltwNwluiQ0HBPtAJRgy0Wk7ccK3p7jo6ZBW8HQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwI1szj1vHMsIp7eqHYaNbH5wgA/TBNUmXERSOaiYAy7/m/f/T6 E/quwOVHRxaAITm0g8rDXFgqFz9Fdzl3v/BlxzwjfnMimylsfRvLBm+l X-Gm-Gg: ASbGncvkAf0NCedFT66PmK4P+UtZEKqKLqJCO4P6vCAqCV9CJ+vMau5uOaKF+UxpSqw KyHtbZW7VILvVN7DaeBwnUYZQ7P1DHDyRoO54IqI9R9Z/AXDCqlDTShywEOkuyA+ePnMi6zm7jw IyHNpSv+qxJcNHjIEeJhEQS4m7XLwk5D1g3OtNJxl4IaHMuxxmUSxKUQNq/0d24G5VQfFg2d5ZE Ka7aDYMc4Bmuk6IgC7GK8H0QUHx6uRj/VVWw6J84Dy/WZTN1EARIPmjfYlCZw6T7+fsi9vsQM30 FfeVMYT8CtH4IPlVKuu/jzZWEEPZib1ZTiqRM6db4EPhymXSOem8glmv4khnRbvi09NM4VTeCby gX7eYrebjcQ== X-Google-Smtp-Source: AGHT+IFxioSGKRKyLPLM3eJBMDnbARqUZZqXwsaH9+NjjhUb+EInhQjMExIxaMaHRLT5C1NdXlkk3w== X-Received: by 2002:a17:907:d2d2:b0:ae0:abec:dc13 with SMTP id a640c23a62f3a-ae9c9b59e13mr1050417866b.53.1752839539203; Fri, 18 Jul 2025 04:52:19 -0700 (PDT) Received: from localhost ([2a03:2880:30ff::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6c7d8fcasm108745366b.68.2025.07.18.04.52.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 04:52:18 -0700 (PDT) From: Breno Leitao Date: Fri, 18 Jul 2025 04:52:04 -0700 Subject: [PATCH net-next 4/5] 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: <20250718-netconsole_ref-v1-4-86ef253b7a7a@debian.org> References: <20250718-netconsole_ref-v1-0-86ef253b7a7a@debian.org> In-Reply-To: <20250718-netconsole_ref-v1-0-86ef253b7a7a@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=1635; i=leitao@debian.org; h=from:subject:message-id; bh=tkg2bjgERJF800sMkU9QziteGVriZ7Ij2VSeuqHCCWs=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBoejVqqvvb1pfYo8JK+NWLmQxzzDEBTt0OQnPh9 OpuEiPtn8CJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaHo1agAKCRA1o5Of/Hh3 bSTlEACL6NOxhdD3SgmYzkrd6+VAQD4Y28EcUKx0nQp6IxBo+mWVq5jv/bQO1+f52QrJSgYf4tm wnLUgrLekw9NytjBSuqOXxbLzK8uapPER6hY6uMLVWhQyxqAVus5YB4DHASgAEtac8yYOTmV/OC PCYwW2jQXxpcTSsvWj9jN4Fu+X7Ip3TwhtOhJU7B4GIP9OHudiVb7p2wjkR8rNawz9A+8fGamdP gXmPnS8uZ8DUsfPgoukUin5SKYVUwYW4D0gjH9gFV9ZObDpE8BpWeLBFpJUc9dZzM7h7OCu9IPw lc7KVLtpPuMBz+XsiREwXVu3QYyXHcQdUlz3OKy89osMxy6HdTKfDc6u997xNBkZdeTbtBdhx40 8HJp/wa9VbyEx/fHfJkje2g2afWFFWPEKyDQwNn+FuiNvlSaH+O2x5Skf4pJgahfzKTGQv02/nf 15YWECYiGu6EEh6M4FuW34jotKncGIZZeC6he/sxc2L8KlfNIRVDQSTIhuTZDRocfFAb1WufLQj HhOPve2HenvXgLnHGY6CUHG5T0mtYGbqSRCtJ+pctXnMrUZU6dXt/CWQZLUfO7En3i6f55hZYyj QW5Dk8ApX6pEDyOtlq7Vd6/pILYrXm/acHL1dsGFWVF6rE2SlWXiSn+e4r2IWeVTuQD04smeNVB wR3yChXeBwAdijw== 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 --- 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 7ea265752e021..3044349c5fe37 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -751,6 +751,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) { @@ -759,23 +760,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.1 From nobody Mon Oct 6 17:02:01 2025 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 E7DB82DC348; Fri, 18 Jul 2025 11:52:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752839544; cv=none; b=nAK2xwAhfLW0eZ1HM6L1ZnLOKFIXiRGGy591iAKwgLSsEJ3OHfG94r4STZfeDrgH2Rpsk9HXXGdrL46AzJaqLGsMdpSkFjJ7+NphpMs8CJaagu7qcYDr9P/D97pzyZAlgVnJ2UEHUwyMf0DFlOA3L/NP5klJGkeBiOiUFLIBjq8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752839544; c=relaxed/simple; bh=/7CHHKqdDDOfq9BdS7bFwCjG6K2UKEXfHl/n8vC+iQk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=u/8XJrmyRKXPOUq9R5WzqgMCZa3nqc0u/e5suWN0aYQsfLFo7UTFR+WV2EDJb2x396jANF9idQnHWDH9G0kODAhqwS83/BmQq99Wzo50j/u6YJiz+Gw1RUYRlZbwtHaaoTx7DO4NWekUMN8rjwTGVfEabDWByyCDxeSJ2Zmippg= 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.44 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-f44.google.com with SMTP id a640c23a62f3a-ae04d3d63e6so370022866b.2; Fri, 18 Jul 2025 04:52:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752839541; x=1753444341; 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=Zfweb8Lprtz6U1Z0+6B/k2IheTq6ouQOgUs35bz0iNk=; b=mjYxsAyK74pncMbvVEAtHXkFkwcETQH9VzrJikRYZ6DMf3C54DrJrczJqvsgOS2yEO e84HIuFsbMCI8W4DY4xFeYWz5Vt6krV26ChbpoeZ6irjA5/cdy4o92LWFdQqO/InPA69 VfRYOJ8jDYMtz8G3oVJ151wN89m1iAv8dpzR27HWB20JxruRGpbZV/kM9xbFiid7dLzm mXG6FAYGlI59lUKwhUjwqD84ig5z/67wIvbICcVXu4R5LVGGpGgtE0gzis5S5hHbHuSD eBOJ7d/8/F7iy8xSk/Ed8oVAkHLNXgSEOe13bTp95+ybnzjqQWpeNDKfNZZdOtTQq9Qa royw== X-Forwarded-Encrypted: i=1; AJvYcCXAiDSzfsRBEc+aKIgr4GVk5nXFSd/JhBQaWNpruregxVPqaZY6rzZ2hM/f+xiufGfJpJRfpmX5ZNyez2o=@vger.kernel.org X-Gm-Message-State: AOJu0YxB7L0gSBIDEk/FOwE7M4YhrtiXksXlS+FWNH8xDIBzhApNdtvk Eh1iXKYKSmUfYKci/2UHYWsCM7wxYubR9YCh7Ni1ctV5Y2mStIhR43/d X-Gm-Gg: ASbGnct5tGWbWIIP4Fi6eqemR0PR5IRU19U5PAdYMeJ2e/njfCzcqEhtgNQOiAkXrrf cApI4j3xTz5UJGkismmd278eSgdcOK25hVzVO4G4sIRGKYAzsodg+BQeU1/UlBONNDeV5DZyxZH PBsJKC4AlUo2C5npInhUOfNPqX3EQ9MkHWDMhplaj7RlWAq2aTvDb3dFYq5h6WltwiHYYpr8ovU QQV9ceA8EW0WG4BXRnKb6CqTGxneSgezauOKX7bJN9mW30qzW777cxgf4smN3P5LdpWKaQ+azRM CJJ4FH1/ejqxXJkYB/e8cVB8ASVKg0b5+ClXPjR/Lc+ewwtP1YxjFy3g1tB37kJ6cHH1T3x3aWT 5C2dVb+ULvHe3 X-Google-Smtp-Source: AGHT+IEWheBDBQ2C9Dmm6F0vNrKz03zOHSrvsTFhF4VzvKXKLrzsmYUJKB6IUKVpg65ig+Mg0hU4yw== X-Received: by 2002:a17:907:7286:b0:ae3:74be:49ab with SMTP id a640c23a62f3a-ae9cddb3a1fmr1088392066b.10.1752839540921; Fri, 18 Jul 2025 04:52:20 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:2::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6ca3005bsm106854466b.88.2025.07.18.04.52.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jul 2025 04:52:20 -0700 (PDT) From: Breno Leitao Date: Fri, 18 Jul 2025 04:52:05 -0700 Subject: [PATCH net-next 5/5] 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: <20250718-netconsole_ref-v1-5-86ef253b7a7a@debian.org> References: <20250718-netconsole_ref-v1-0-86ef253b7a7a@debian.org> In-Reply-To: <20250718-netconsole_ref-v1-0-86ef253b7a7a@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=1594; i=leitao@debian.org; h=from:subject:message-id; bh=/7CHHKqdDDOfq9BdS7bFwCjG6K2UKEXfHl/n8vC+iQk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBoejVqq4JQXiAhsZ3aVkfrRk3XeTMPI38IDOwD8 bLHNjpZ7WOJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaHo1agAKCRA1o5Of/Hh3 bT2SD/9ev/w8JsXlvdARvaxqs/o87KAJGwZGYrU9fe2CM55TzVuplvXPF1J4Cm0IVI2bBs+wG4l 5uuExjvhODJjs12ma2Ok/wMLEp48MJ4e5oVy+V3jV1jRIBAl5YmliKK8PK72C0Pk86I7yAu/AKc FuA2ff/QqCPi/LqsL+LFxHGHKty4ShNICRco1r2QECKJnoORLEkEq1sIL/myhc/83eJI4Tx5JIF qCMyaANogdpYHl0afBvfrwGMEoH5VOhiJUEAv/VEOxiBo0e/65q+7NP2aVWqBmOh5U7bmCuj5SK NZwo1ha1tgT+X/d0fSmU6kms8A7pCxOVJq85ePn8aGEKHOJhCVpXu5qESpIBQLStdMA5imcG41f G51Sj14Xg1aVRxnBHZD9uAC6FB88XvJG1sPuizKVYiSGm5+hLPcqaIceGJhn63RD12fMc2B9Zec ejjPiC7J6gRyQi1urIJJgbkluTLLRa/fZi+9OwdsPZeLPiuZRYyFB+4JsEhT3wZhyDhqdYiy8RA eIdPIRTDKKzpjLIQse6jTjYl2qAAEMEox+uv2iXzcRcheJHMPJD3tDz78ffiV2Cos1qHoOezmKk hswRFOZ8prFKbrMU+j9PDKnQwfuczE5fQSzVw5sFNzschRey72cZ4li7X1gYr7pGKGdv5ZPaoCd 17KPubzJfMsNJCg== 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 --- 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 3044349c5fe37..de6f1a7c24cc0 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -776,6 +776,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) { @@ -784,23 +785,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.1