From nobody Mon Oct 6 13:17:35 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 13CF92D780A; Mon, 21 Jul 2025 13:02:12 +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=1753102934; cv=none; b=Wz0ASdAGz4a53Uyld6d6ll8nL2TwEtIx9BWcxkV84K5fDoRFeJANeSbjCbWoccJIlmH56XwU65AXtmx7nobcG1pTZqqdqeKzaXUjOwwbUkSnfb/XZx1ojTaIo9b9mzASPwQolh9WL9JAEQIQdKmO8zmaBymXPaEpqXMMyqNHsbY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753102934; c=relaxed/simple; bh=oagYvLPRp2ebesljFuBIVfa937xZLmXWPbPvbJX8Vb4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dx2tQJjGB7pU/1Q0X0KCbGdbi4odsoJ/cBJNgNNL9XwYdxwM9PRzkVXF1b7aq7+9ziiyySW47QBWks1eYQnFQoHuXBiXwfdQLOxD7FcBVD7YXxN/XA85EoK8vD4yM6EqwZxjGq/N1Rfv6TWmAW9MWrj71vEZozs+OJdABfO6mEk= 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-ae0c4945c76so577383966b.3; Mon, 21 Jul 2025 06:02:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753102931; x=1753707731; 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=jka0m/b8zqXGHzbaf0s2reem5D2lo5hly4ZoesW1ruXIkT13iyKE8JmStOg+YDPuqK YV5XcuyDYelOW26BIsOk3xBE9OYXPIJlhbheUW822IP0Tvvo8cWuZQ5jBIc8TDu9EHzf Kh0FlvbxaFpbRDOU8NlkLKvwVViyVvJSLkGpYjAXg+ARcsavio0fe2BNocw26l0WXCvW tc0Jogir2Ts0qGQ30BiTv4cNd0M5RCCvPlLbJJvJK5R2PmO4pYWdquVsMnOUCr4uxrIW xZn/dd8+PgfVt3/Xyu4uOlqX/kGfjTpyFd7oPAaotTKyEcsOU1Gy08rf0xHwy6RT9aaC VoKg== X-Forwarded-Encrypted: i=1; AJvYcCXUmOcUYKNvZzR9I2yyswBPZHvLjJfRmKye5joP6Oc45H0BvO18e4Cc2sKfYpqTNNn3NtsMoI/hZxrR2pA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz46Z6OBfHQfrwms9mPvCEzfolgcn6kovAc4LsTUobsEwPrjId0 hBUGSgXYEQ0W2xHF0rxt97nD+TLcjh3NpCxvi781pHqquTBkhOz1TuZcUWhzWQ== X-Gm-Gg: ASbGncuPsONk4peTgTz5Y7pX9FZlpaviQpwm3N1yMZtI4JNqfvY1qutct94c1tZqMAf nPpCUg3uwpQCKx57pfmmOO6ZGpnEIEOqFUykJgFL5IjsDNmnEHg8fdKXvL44JCOx1H7SYG4fS62 MNxZECjHggSvVDSbo5ik8GxKtdqs+iHCUtTQvAcvnn3xjPZnMg7SrHI5jPitAl8KrBKwgfxaOn8 Wxwux0INs5eQK6IQ/NkT+/J0e7NZk0zDpvPowsGVFUOS3klzqZHU55Aqk6vDYkNRQusiXOd/ity aQxo0eyz/H2PM/cd15RBLAUj0G4yYJ+klr9CF0GnoR57+zlNkFclGPqtN7Yjs83o0ow0IAqVCq1 227XJ1mAwQV7F X-Google-Smtp-Source: AGHT+IHRZVLcxa3SeMX6xPW1KQHsxQWWjiWfUsPZq8WyrGXDn9EV3khlqnaV7H3n9rQ0IkTAdRchtw== X-Received: by 2002:a17:906:6a25:b0:ae6:b006:1be with SMTP id a640c23a62f3a-ae9cdda3d41mr1993116466b.5.1753102930486; Mon, 21 Jul 2025 06:02:10 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:6::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6ca7ae11sm677073066b.108.2025.07.21.06.02.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jul 2025 06:02:10 -0700 (PDT) From: Breno Leitao Date: Mon, 21 Jul 2025 06:02:01 -0700 Subject: [PATCH net-next v2 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: <20250721-netconsole_ref-v2-1-b42f1833565a@debian.org> References: <20250721-netconsole_ref-v2-0-b42f1833565a@debian.org> In-Reply-To: <20250721-netconsole_ref-v2-0-b42f1833565a@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/8eHdtAcsmYgBofjpOWKitypCa5Jn+jdxZ9bJxqnYDHoXwR9jfJ SjGCeEQyUSJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaH46TgAKCRA1o5Of/Hh3 bepkEACZIExgS+ni+R+3NYK4IS0M/JhkTrDZwhU2V90JAjjkX54m8tBi/YY0T/VdiXech3YDJ0r S2KXRR4QFkGU+A5Q4D83gE5xfNPeQ6bKNxOHszGRzRDLktt/MCClxGdmqpMajjRDbCaanHAmhpb Obgxz4nhn7gAmjdz6oHV8XSa9CDc1kxxQZ4pyZby+dJfstNHhJAZK5ADOZ6z0MyPDe3JHL5n3Jz BBihgvdviu8aGcVDSoOg09zscZG+byo3vBhYFdFBLJm+NIiGj3Ls6bT5BIESI5ylCSmf4gQBR48 DTL2kIk961RYQfnm541FfJAheYPCfizFAauO8yoFqw0j5/DU0qHVDKUyLgNO6P79pNFibKs/8l6 yNBsKmepoAyhRZ1T9tUFyT58k8RF2mdkPGWcyhcsnWnAKtf9eAFPj6XAFqAxSK5yE+STF9OpFp9 zNrG2y/gkjBzp8BSs6f8KN97cm+HUqEt/czjQsAxYQiaAkmX30pOJaMKO76L9xcbRi7RAcx9uH2 QHvMSgV1WCqaQA0xIIVYwpawi2B62RtjqXNLocBP6/oPPh7JASjqURnVkfrcg76KIqi2WLZiuPP ZxIQ8d6nlOcNE/OJb7fPoG1uSPlHalD+oe69G/Y1H1jD2jnP+dEDu09qU5MJL8jitsXTUzXWElF BEHVL2XtpqnytlQ== 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 Reviewed-by: Simon Horman --- 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 13:17:35 2025 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 5AF772D7805; Mon, 21 Jul 2025 13:02:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753102937; cv=none; b=icq7J55/nhbdnv7F2hDiGLaCiqfhVyWzL4Kj+KyoWhe4P++8uQohFbmXvhXpg2s8dXED+f8r/MEtb2Qu+oygrqqVbVLL6dMVrEW+5n1Cog0c6pXUADgC8cAmFdEMzV0RSay54hcEyzblNsz271fmSzjsnLyNyF3PXvFbaqso/OE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753102937; c=relaxed/simple; bh=UeTGUYRKeuwDXve/GI/R0QfycaffmuY7Dt+7pG5Ntrk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Icf5U8flsPEe+VJuoV4afKXHfAFb+0U/V5M74DlTnfNrf5Smwg7TKZYDyXAXDzoKsoXFsGeu1oEwjg5NMIVZQBEcNtAKd8dKntQb7jX+GsJFqYhH/Oev++3mNR5hVtjbF/oOZGA1G/UaYr4tbSTp4MxJNUFJhqpfI0679jN2oe0= 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.42 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-f42.google.com with SMTP id 4fb4d7f45d1cf-60c4521ae2cso7608268a12.0; Mon, 21 Jul 2025 06:02:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753102933; x=1753707733; 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=2UQvlecl24zUyb5wtS3n9sQxu6Li+ODjsFHxe5Ob9Ag=; b=K412awtZpdCx8HyxYOUcpmFZe0ZZWPkEhT55FuchYIaGzzRrVTBIPhx5sP1WI1f5cw os8R1IDpo9a5M1j9W/4I4CkpaM0qhYYH+dAIx+Xpw15AtUXj5r4Mjc5L3LvlKO+Cb3AR 6H8l+OnbW1TaUZP57c4IHSgPRXF6c1YlMrBYSnD1lbchLCwlSWh/6Si/i/3d2JqqFi3c hJFrt1rfIBjzrAwJkTtBe85OErDXwYWSRUY5NHwiOr+cnkOBjdRBzqw/dyvDT3/O96wC o583swnVYdTrFkgBHKUs+shQvatPtQKLVveE5eUw2j/CeDvdyAaEyyKqa72fokuDK/Sy hmlA== X-Forwarded-Encrypted: i=1; AJvYcCW2aBRA+2P6MNQSaF1bfggpyva6NxiyVPV5Iny21ARH0jPy9IT2RAlaRJL9i3xrV95QLBJtu1v5aiCN+Ys=@vger.kernel.org X-Gm-Message-State: AOJu0Yy+DIS24m35p2FaK2VOMdTNYXgZ/whQWUi/Fdf8CbohutZ3+aZ/ FwHJ4mJGS9WAW32TGmXlBOTvkl2vr6ceLosPwDQeCP+nmj1UyTkCsvC9YfOHzA== X-Gm-Gg: ASbGncuz3KqW2ppsmM8uH94UtSpp/Xules8y86sYGHctHfIJmJlx/TsJx8S3iVbMVTV Yn/gxQ39v8+KiPdkArOwV2k6HfUw5YXllXXcyVoB+FmGEoA+v9xRrgiH2mU7DkxUaAPc0+KH+E0 cPcf2DXMW9G7yCnVH61Ffv3pAv0MR4tLKKEUoNYAUTBCrpazjCd8TRyVGDFhiIGbEic49u550mI fkYhlXkbJLz6apW20LRVttuMCpoOt82nyyDLrhDFS7dD8fNfbpAVtw3q6RH2NXo1ajJ7qPqB79D iH4Aosr5TCuJ9Mm2c98Nnqcwa7XmEzpi+sEABSUcvPLyrrhWiXzuJ1hiztgQQEBVa1whpROzPPp aFWvzpstzoHXQ X-Google-Smtp-Source: AGHT+IFaMoG7c16tc3oC12jUw+W7U0SiaL7+1I8pv6CofVmHpJx3sJasoucoBfeiBOf2deoWQog8Hg== X-Received: by 2002:a17:906:f5a3:b0:ae3:7255:ba53 with SMTP id a640c23a62f3a-aec6a672a23mr1143845366b.53.1753102931969; Mon, 21 Jul 2025 06:02:11 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:9::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6c7d7b9csm672901266b.61.2025.07.21.06.02.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jul 2025 06:02:11 -0700 (PDT) From: Breno Leitao Date: Mon, 21 Jul 2025 06:02:02 -0700 Subject: [PATCH net-next v2 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: <20250721-netconsole_ref-v2-2-b42f1833565a@debian.org> References: <20250721-netconsole_ref-v2-0-b42f1833565a@debian.org> In-Reply-To: <20250721-netconsole_ref-v2-0-b42f1833565a@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=1886; i=leitao@debian.org; h=from:subject:message-id; bh=UeTGUYRKeuwDXve/GI/R0QfycaffmuY7Dt+7pG5Ntrk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBofjpOyLAo0ONXYxLsaCtLYZeLoQ8PQJcJ/Yj7W zyXhMLDOQWJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaH46TgAKCRA1o5Of/Hh3 bbuSD/4gFbWhzeR+tVZuf0kiaqgTVijBmROJRRucZPMDRgtNQrGZ/Evlr35NrgjW14xVqH6eLQR Vb7bWxOuSi03FxOdGvneY07SpwkTXoPhSuscXU1eSnzFlQ5xtmpNITyNzr8m73wpjolF22L0bsl lne+LSJyadDFwV3aR2xIQcHXgVZoZ0iRZ9T1VkYVL2Z8la5VkpV/3B6MMkI58vR91KFzKUV/sry X7NW2D+hAhEl1Ueq+pB40aTseh1qSlwMfGfWzQMQGWxTOQlkr+FCBlOH4UMpSzIpyESW7aed3S5 g3hWTyebIk18qQkkJYJjbPloofir3Sb1mKocOQn6SE5iHhD2Z3O1tlVjKJvziaLe1UD7TUv92XJ vGMiplNaP25HJBTg5hCjbIoI7kgbFQgX3jvB5dZsMyfNYBmQV1hX94BOpfefoQ+FCy/bErTpCtX vUni/BT2amLY12I+qP76fMvsrpJvElrikAVOt8RAxPZJh71UFOXRd88fJjV0FXcUR1lzzO3S5FO 9MhQ3IVg9ngivVOG8gcUV+4CIsaoK+JoasI9unsBvxBPtTI79ju9oAIwtf+k7SbE9gKtpmtvzld HJprD8lfAAYnAUYiZrdUrIKMJpXwOM545EGFvA7dGNiJc8oAoX6h/pcHJwfSKrGcCAPDimdezYw mNyHIazYlv6bhFA== 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.1 From nobody Mon Oct 6 13:17:35 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 31D502D9EC6; Mon, 21 Jul 2025 13:02:16 +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=1753102937; cv=none; b=uG9gV23p0ZNXmhLKCp+5218aGSBgQpPnNVDkFh5FPACBkl1uH6/HEVs4P8ZUoUrj1lkoV8JYoclR9wqUNETavy7q0uR0bUrF4+gq/x3c8tEqwyZkrh0x/b7OizkV2ee8h3H5u//73oG2yXwu12ay+DTrcuJX08vQj3g08zlbLVw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753102937; c=relaxed/simple; bh=ddVQfgG6jubvKWA/Gm9jg4YSEtAfkTXic2WiYLRyy/I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ag6rSe37KB/UPmv7gNODBfHRTnrrjuZq+JjAiolBstdJj4/ixl9hXm86jvCkPp+sNdhgT49YFolP645B1IzCidOTnRaw0ZPm1agU8Uneyz2Vg1cDkjqJoX9YxL0v+Y8nCPy6SZNBfFTkxx6/LeT3AI1anNQ5RDO4Aq/Ds2+jBuI= 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-ae3703c2a8bso751884866b.0; Mon, 21 Jul 2025 06:02:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753102934; x=1753707734; 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=jI6UB5SRdkYNp4YBnhrLXfnFpi9zUC7GGo6Zqqmjnhs=; b=QoQ2KMi/heHHExvwgjl3epvV2mU0v9dYwW7Miqg6FlonsNUHjCUv/EEEfQMB4DYvaV 5Ix9m+Jc76N6UUCChrWvCkIR6PpqJsilnCgytnOgPoAOzYqKoc8hXW71t4pqbpKjpOeP 3kF1n7F8rL94xpYuJuYUTG+3ancuWeCqXYw0Py40nqtihZsO4+2esOG3g0DWZ7xxzuHF S7TmdiW3WnB969+7zVEVANkoMGO1kPAHSLPkCKdzttyEwvCtS1kj0F/1IC9mGmDbNNxH 8JQitgydstOchAFKFeW/4Ek7whUEmAWUy23XkUuiD1u1kGuxbj+K2SAsH5FxMRwiao85 bEHw== X-Forwarded-Encrypted: i=1; AJvYcCVUNFh4MOwwGXo3SnK2XN6CuqUGupbvX/QVPqC/Csz9lJS7V/XV7X/Cg//OgCAsGC2gYWYhwmPlHADWnvY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw43keIQGSlG5orl7e5xvhxR02UhpUVZg+ofbyrH7sdyaGHb7Fp nZB0NNJy4kL8yxOty2CsXfKEo0eHG8kNXnd2Bf4LhiYy/UhrZAMpqy2EmnadRg== X-Gm-Gg: ASbGnct1MXbXY/TV+Bv0clJC+GdOxoqRE6Stn6YBg975g8qr9OmQD3SfP0UnoQDZwO4 2DDY91Y/7xEBF8dH8gHWuOVtEhO7A02o/wI7Sgx6hlyf0aV42DDtqDhg/LrMk+y5wyaMiE6+JgJ 8SQ/n0+UyI9FoFdO680xQcEAnRsRzmlBEVucf+vvpEVUIbVZDcoBB6OLVGkgreWUSmcE+tjsWFL roxh5XXraHxzBqY7N6R62vOeKlsxAFO7uZRJ1/CpsJSDzCx+C16tzK2kqzue13AdY7Nur6K/wSi 2SBCrQGT4yxV67nB5uxIsR3h+bGBU2gYxmuEgasubC3YKO1HVsM0u3PNtWKMnIx1BKm5EbZO/ZQ W0OgzTCLRcOPV X-Google-Smtp-Source: AGHT+IF0Q/cK7OUcWuJa1iIS3qApwr3++BY5hSSWSGwSVb0NXNlY1SluXDlxWtP1XllATFCcFQxe7g== X-Received: by 2002:a17:907:6e8b:b0:ae8:476c:3b85 with SMTP id a640c23a62f3a-aec6a49331amr1115894966b.8.1753102933657; Mon, 21 Jul 2025 06:02:13 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:8::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6ca5a029sm675031766b.75.2025.07.21.06.02.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jul 2025 06:02:13 -0700 (PDT) From: Breno Leitao Date: Mon, 21 Jul 2025 06:02:03 -0700 Subject: [PATCH net-next v2 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: <20250721-netconsole_ref-v2-3-b42f1833565a@debian.org> References: <20250721-netconsole_ref-v2-0-b42f1833565a@debian.org> In-Reply-To: <20250721-netconsole_ref-v2-0-b42f1833565a@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=1593; i=leitao@debian.org; h=from:subject:message-id; bh=ddVQfgG6jubvKWA/Gm9jg4YSEtAfkTXic2WiYLRyy/I=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBofjpOQd/a/5MsAilGdZo161sFuWI+5oGOBKAGl dGLV3tgLj2JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaH46TgAKCRA1o5Of/Hh3 bYvaD/9WT79Kh+LUxaZR7TuMaI6MLYaZsNem941W61FsHcPGLKdPyVnwZ2YCo5lG20fcwqlLtrK 7btyGtrfv2wKzOn7cfXQLUJVo9c/vMIqmxUH4SDufNP2Vod3VinHw6BupuvdUqq1ntiznwkvgvU 6Bnvz+u8oexGzc229RuhpXP+H9stYLj1WTfuYliSfJESqkNNfRFHIbqAzptszgcLVTwVAs5lPyr jnoXF9fKDACcW86ErYBHD9WBHuRGxfYCTeCdhkFbMnx3Np0BOn3IzJCc1//rgtNnVjlqWkbljh5 KQXn4zRT9w3vIztGgUG06ooZXBrYq2K3UIDJrWNMJxBy56Tp8eTs3SrJOZNqcfkDcTaEc7tkJS3 c/pMc4O1noLDU9JGMLgV5WxJyKlvMK82ic0iNnij3Z8Dl1T3RYAxa/PARwdSkDjFqsIyvpsMIM3 5akDUEiGCO/u1pg9G0EoYnBg17wCCZwSLCr9ThU4oTU8npG4DXvN34x5sNHdYLxXeAGodF4mCw/ YwxX5p4DRmR5IUY4HQlRiCHyArxYRoabfxuF4j0dU9EuPlq0oWmvE7zyJx8lHX69t2+zSLn9vDe cPHbVJ40DWS8YClJlDOGm1mjXr7ZWmVTIy0hhsLiHciV+conehGloctde/eA3hvZgPlQSXVVSxN JoH7R1Mc7OhLL7A== 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 Reviewed-by: Simon Horman --- 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 *n= p) 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 13:17:35 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 06A1F2DA77C; Mon, 21 Jul 2025 13:02:18 +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=1753102941; cv=none; b=fwrCAijJOYCAzIapZzEoybZ3OrwAs0HXNJ14nlfD66nNVj/w6kBTCrRO7ltw4OqPbdji0aQLR4t90rvuVjfZsyT4y4N3xX1MA9iN8ni7ek5EfdDqHtcQZcJ2NGfj2qMzGXeVdmNVDHNUEu6ktNoHEqZBukHee76zPVDMxq5wNRA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753102941; c=relaxed/simple; bh=HGHEJEpfTTnCKMSvXmSpHaX+D9jiWr0GaLfvMmv8weM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oXhtVyHcyIiXEU9cNwPhbsNDg9X8qbIq6jXdN8hIWbyFXXBHrEUsJj7ZDmn92P0WTUqsymBnA+qtIdUNAx3x73YsyoePhma6Ju8B84XHgRB8g5/Hj1Tmg0jsRuu94ybeGbgBWz9yBE1RLA8wrshyOMburFyAQRDTtLht+I571Vs= 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-ae3cd8fdd77so815228266b.1; Mon, 21 Jul 2025 06:02:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753102937; x=1753707737; 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=0pcsGFA/z4E3qlFNo4KXPlzv38omzg647OE6G+86p80=; b=k2z6OgUnCAiwDlCdmU0ECFyqdFVeFd5FLzGAU7KEZWh8MDmSsZE4xDh19zQTgqejAT yxBZGoVfEEZEvBoDpWNTMQ2Y/2kZzefYe6GnTpwEAcmYo6zkZ6+QjukuSHtHdtA992B4 5bA4p+zNj4JmM/qqmK5slCPIzeC42pq9WCQS8/4Vam7PD4+hDZiNYvzTmvgaA8nkgT2p MknnSBrd+Y2OgS31snTf2KfBC/gr+B3ns7MwonhrmPfDI9nptXImtgF6JoLLos9Nohdg ozpXzwJW6ccbMkHhm7mgTByguG2hL7Nisd2At6AG7GgJOUW3bwHIpJVG4TaBtgbaMGhy OtPQ== X-Forwarded-Encrypted: i=1; AJvYcCV4OhpTlpxUUm/Bw+X2pTeEpcso5oyrsyGGuocPs7PLQxAUcv7EUX0106eXcpPZmwzqkvFIRoioVN9wGFM=@vger.kernel.org X-Gm-Message-State: AOJu0YzyyFWnjFEbeSXC8dWpEMcDbcii9wMcUA7Rq6inSYnCyMUGA61q OszNi/rBomXbFLl1VmjQuiA5jDtVb0hevDEmusFqhs7UW2WDm82jyRFE60XIWg== X-Gm-Gg: ASbGncsRR8uARVuc0ssH+L6kLLbrZeLe9A5dFaKsj0Sk82+X3EIi0cmodeZEaEIWUI1 jwUzlgP7ArXApsjM4Lgu6jXAQGQ0W0OWOb+UEblf/FMm6XUJx/YeDIUGmgOnNsd+1d073dJA5oo XoVgh5q3REHKYJ1h9mIKE76SI4Kk2qayIWmTjKKguXRJG7Y/EO5f8Y7qhubb8a5GJLbfB51efc8 FD+iXPOKfeILx6yeLFgwQongos3C5b455NUiLowUBBWg3LWyM+iIMuZKnony2V/0K2bBPUMMoLy i/COefpPHZJs4bk2d8abviI5MFKOISBmgncIa/Q+V7Aoacah+v1RCOgnAYoNrLR1zZkn7KBz8aD R7muKWjYLt669rw== X-Google-Smtp-Source: AGHT+IG2YiDZgdlBrQItp7gCjN55Ql8F3DS6tT3ajOj0xJ8Rnm4TSHk6fmVhSaBREMZf+Cc2a7/q2Q== X-Received: by 2002:a17:907:c008:b0:ae3:b94b:36f5 with SMTP id a640c23a62f3a-ae9ce0d2fb2mr1686007866b.34.1753102935290; Mon, 21 Jul 2025 06:02:15 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:70::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6caf80e5sm676792466b.163.2025.07.21.06.02.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jul 2025 06:02:14 -0700 (PDT) From: Breno Leitao Date: Mon, 21 Jul 2025 06:02:04 -0700 Subject: [PATCH net-next v2 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: <20250721-netconsole_ref-v2-4-b42f1833565a@debian.org> References: <20250721-netconsole_ref-v2-0-b42f1833565a@debian.org> In-Reply-To: <20250721-netconsole_ref-v2-0-b42f1833565a@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=HGHEJEpfTTnCKMSvXmSpHaX+D9jiWr0GaLfvMmv8weM=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBofjpOHJ80y3tzMth9ZwSgs9lqGcV7CSXUEn4kM 6TrA8ECkmaJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaH46TgAKCRA1o5Of/Hh3 baNvD/92ebA1ITNkN/bRA9TApce74oVY/Kcikc05GVXljrN/ETvcSD1VjUnTuNOLN0TuEl2G4NX ppPKKQ0DjoaJZa2YRaa9+v093kbb+9boOmXkPDi1/LkMmaZHoM+0Y43hGGg3/NEIbZJXsX/M0gq YCFQcGcmaKly+a6mqovVOf2cvBUdJqpp0Xfa0C4aINMEVoqN1YS8G0QPsTT+EygoKpae+fdKuaP vULt/yPE9dLZ69zxrDeW9ujlXN8cVy2bavu3U44ybFSqWcqX2xgFylNC6mrQNkIa6ENExPanL1s +JC//8zKnesfCUZ2bxPoZ01jGvqEZoZAJ4sPIOa9oDiJPBE9unzwSYAktOPnhpDN3iTT8vFA/3T ZzS84eOeTLda3ypqxGU8SLX2QX/GuN+T/eGcc4q2EwzL3P1Glo3NH+S4tvGn0WVRXMZ3OsYR/bD exkL9XuG33P5aMZmkbplJda32wqDQ1yluaUBuxb999qO2MLKUYAEYwi5hrj6qQw+oqnTuyd761z gWIPi3LfKLamQs6O08M0YfHHvQauE0oIZHj59igORG+EVzNxgP9e9KB096V5acZkJT9r4b/6e96 4lKNEqAUdZkQDfwUEh0wctfeKRMdbP5+1BC6DW+3nbosD8GIEc20M+LDHzh6TC09/wilUwdtdf8 NWxGn3P69qcefkg== 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 f2c2b8852c603..b24e423a60268 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 13:17:35 2025 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (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 53F7B2D8798; Mon, 21 Jul 2025 13:02:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753102941; cv=none; b=nEZaHiVrGgvR/21XBmmTxppGhL/BJRoaQogRbYUMQy/ZaTTyotSdCSM107guPii2EG/MumSpr87tvdelABTuqQj/PBx9rAOqutoU7GKc9m5nY0p8H65pl+oORe3fIg9lg03bKy20hgVPIEJ0UwtHjDyCt9WqqwVNzTv7D/L27Qg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753102941; c=relaxed/simple; bh=4JN0ATgLpCma7eYapT/JB0yvaXsB9QCd/f7n1PA3K/I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tEfsKwvDeByhpGMpzyj4Qk87+1jtbBsAiE0v5H7Uh2JGxIJU45X7BH8ro8Y43dvtrxDXs9bmS3HJFF7x5HkVGTz1CPIlPZ7A7c+szikWgTav03ff7w+tFcZEEukPc7hGvcOe0X1OneUOy68u9Qfj2BGUG1Um7t7YN9ZP+THmntk= 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.181 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-lj1-f181.google.com with SMTP id 38308e7fff4ca-32b7113ed6bso32968571fa.1; Mon, 21 Jul 2025 06:02:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753102937; x=1753707737; 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=wkOlTgVZdIpxOKYlGwV4g8bCfrBjHtQtpJ5LGJBlJ9g=; b=O2ENEkThBkP6hzL22gPgdV2TWiyzQYY2t998wo9Gth/guj0wlrge+3JPAfTUbMMp/y P2wokyVvrUVuZZoXAyXM40HLuudzmWs1gUUp2PVvIC72TotFzO43Uw8KDeCFXFu0HcQ9 MgtNV2oSGf+N6v2URgTi1eJrepG22oX0zZxZcidGgCMWJGqRAx+wAWH1dn0jULgfxzol D5dmSZpVALV0OoMp6NiGRareeqI8H45tTf+VgNtYshFtwBRACGMsz34wiL9ZECZfkTxx YJMJTTTvjBmNyeksqq40x96IbQ17tH5TN23Rqh1byM7BhXP7cKRCjhfuIcy/dJgEVAM0 Vehw== X-Forwarded-Encrypted: i=1; AJvYcCV2K1D8lPFhizqjmG/cowC48+oQUTkND46kYZZXs+DHsBGErpoTHm1kYA+MO3tz0uBQZxIcR3jZFAOQMqY=@vger.kernel.org X-Gm-Message-State: AOJu0YybAK5Azi8tDcYKDpvdhmLNUf9U9TddRMSSVLQdSyoACLELtBN3 TpkKERQzykLl3IbcWTLA64JMm8MsykKzktAJIE6PqLMmSvI0BCmZ52E7jtoMxA== X-Gm-Gg: ASbGncuLmYZ4OCegPtro5fPpy+K6p+l0onJbkeZLX46X+4h/yC4UEVrCt0zo0nctOkT 2M/ZAhrBZFT+nt9pqxxNBFmBf5dOsFO2QhzAwpy78c4E2KJMZrswXiC6spTiYNEnt4LBV6SicoC 39haYotxjJLiueFLsritwubaXXSBBJVW1w13zjE0o4y9mHI3Z54+Ejmegwx3DpkLNNZqkJ6G/Eq y6Lb5cPo+MsH8jQ0fDSXqGyKaqw/POrW5L4STRwkC10jaiB9c5hTaZ6x23rGPCCyvCHti3WxtPd H79RQS3fPLKQ5putXjdfRrJmFA12wfZk+cRY0PTxpBkxTee+Z6UATJ1sNBYZQxZhldEYKoXxgFo rI712ePQeNEfk X-Google-Smtp-Source: AGHT+IGlgtXEcUO519UxUQeLhFSjYFtZl4JRfRX+I9/QfVF+ZoiJ+TuyoBIaVPBdEbhS0IIaiIit6A== X-Received: by 2002:a2e:a7ca:0:b0:32b:7111:95a7 with SMTP id 38308e7fff4ca-3308f65f8d6mr60856511fa.41.1753102936873; Mon, 21 Jul 2025 06:02:16 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:5::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6caf7e78sm673456366b.158.2025.07.21.06.02.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jul 2025 06:02:16 -0700 (PDT) From: Breno Leitao Date: Mon, 21 Jul 2025 06:02:05 -0700 Subject: [PATCH net-next v2 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: <20250721-netconsole_ref-v2-5-b42f1833565a@debian.org> References: <20250721-netconsole_ref-v2-0-b42f1833565a@debian.org> In-Reply-To: <20250721-netconsole_ref-v2-0-b42f1833565a@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=4JN0ATgLpCma7eYapT/JB0yvaXsB9QCd/f7n1PA3K/I=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBofjpOItlTbQ1fnsmnflHZwrqxfL7AqqCqylI0E HRPfRUxkwOJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaH46TgAKCRA1o5Of/Hh3 bbPJEACTo3JD8fIsSgevIhoiywuZoUxI4jePTwbBibl5B4P81BOhBhl9kJxA9P1Msx3dg1XMmSv anAUhSL0KbV/E0IrSZRW4oaDaIq4y6q77oghJqvVY6WxDUngmvtELFySDV2joJRmVCexJ84tPr4 hlnl7G5paxHKDiM8hpisnUuF7A/9jZygnjQzgSwE6zJnHs4M6FKit0pfVIWT+1RkKS5NI0DeDnI mtpSk8N8zrlr3JYRfT3beNq5C3BQDh3WxBRbaiZiEYZT1wCzdUIQNx+5MHUIag6fz52zigi4gfZ wnvRRJAMLTqKcZXTsGZ2lB4cPOIXlVtVZqroOCrc8HjsNReWzSBVZxXXBpagmGUSZ8llOHOEyUz FjaafhsBrrnVW1wUI9XFBMc5SRmLXkXGfPvVoLILU0UXWf+16tvca2r3zzdccX4fjLvMUueIOP2 VSUmOHer0PGXBwBA7JniIFo1CibpkYRavQ0a6TP01hLwIJ6Vg2Ng6kRu3L/XclitgE4bVsEE93U otlG1TqnSBRe5GM+7sl19nynPhfxdTxDfzJQVUX9s0tYQjwj4ZjN5WUvysKFXX7DOwNtVAJxYH6 C1m4uNS9gpzK1mxqmuAK/9qAAQuNFKviOhlc4Q+gcc6598AQVD4ocfWJm2HeQYHyUiSbIRiRnV0 v3Uk56elxvw9QMA== 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 b24e423a60268..7b394488384ea 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