From nobody Mon Oct 6 06:36:18 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 1B78F1E5B63; Wed, 23 Jul 2025 17:20:59 +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=1753291261; cv=none; b=UKikommL7ocFl3FKCaI85oXxlbm18LRB2S/KM31/vvwEhLZvpukLubVbf7/JbqSSOzQCNE4J+PvGD+aIYN1n3Dq5gXPq6QogBQOrJIM9aK76VjXzq5AuPLm82UEFS5fUlkjG3IIFXWKcklcjLz0BIbcIy9zfqBQWatTvC+XOLUI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753291261; c=relaxed/simple; bh=JNCUvYAKAcYvytYcFZUC0ZZQ+BKoXgzr4rgXZit3ClM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BEFxzEk2KRu7+clJXsRBNSTk0uqpBWXP8ey9YPp4SL2ht9P8D6uFB8x1WkcWMB1RLC3EBalamVIzXeLReyqCb6vyLTOZNVt75/LYt0yJdmoVL5zI8QV9qvLa0G491kbGNmWqf8MnnXadyqQ5W8IUNqsLrptvbaK4XQ5cNmwQROY= 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-ae6fa02d8feso12599966b.0; Wed, 23 Jul 2025 10:20:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753291258; x=1753896058; 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=zmhoj0JvlwtC+WTj7uDYiiR+4+HR3hBWi5xamQPnXa4=; b=rYNtfr5QzzzqepdWSbmTssZqtoFSJd51aNymNGR4W9OH/8TYd6Fdd/tBCpojf5Lhk7 wQMTNRdMNatnFjBeUcJ9Ibghh2d/GjhIn7AShvXE9Al3aC40OFee8EGrJUW7eS8EMKQb cIZ9fPQ24P5IjPvtA2lt+suNVNTaKOQt99i8GPJ4XGDaAnJWJG7z2K2lua7JJnT8CpJJ TROaj4tjejMt96ws+Ikgm32x0ug7LZaYfXYyNC/GzVeDItRH7CtU5E1n4R5CHSezd93W LE5bDiE0immrrU9mCOnGyPtAW0c/DCtaf6rP/k4WxR7Sh1qR7rwm/UsGuVOp4xNYtRKs yMOg== X-Forwarded-Encrypted: i=1; AJvYcCUquNM6tnw6ksVr54pUeypRWwVGWTRg2SxjW1o9uIeBs0zAX0BvU7tmLlSvjv5n9QZNcFo1409bXgAV4h8=@vger.kernel.org X-Gm-Message-State: AOJu0YyFK/l6zCBycoilaQcatTGN2F2XUF2HiXZ+S9z+HpYpj6Sbvfq5 6HTCRLpjmJKMk5kLH6xCHeIrSd5Nm1mppz2duxsfKVCanSbxA4xOKbOx X-Gm-Gg: ASbGnct2oPxBaAwRk68tca9ADOCxOnTXpRu0FfXHpaN5I5n3vSUJSdIoqmZDE1ogktP Qd6zKM9nN1S3U2Gxmcui0ogR0j/oauagT9r9bqxYmVy2mzNcNAaLJ2RrmH1QPtKR80a126OWxak xGp6R2BBqai+DAYrB3mP+4LU3mt+m54hQIdpNGBP+R5tgjfcA7OIOjqkBJaUU0lZzu5N8i8xcnY PhlNE8i3SURe4avmj3YhsueXfB69Qcye6kaB5F1G+GNjKHL6hy2gT3G2/FlSSqcV1OauAnwy5Zc ZtaPSbTA8Lu3JTMokPfm613cNhE2UHG7uLOOWB/t7Xlkmzn/UV2iUAlZoWX9z3c+oviwFx52hT7 9p60VHrjHgS+p2RADcASopCg= X-Google-Smtp-Source: AGHT+IHY6YrdU2+GO9vQ4Fgm4/VL3gp8dUmKwH701rEWCVtSjU/EYUkDpWQprPaWqOdAk/UOml29UQ== X-Received: by 2002:a17:907:7f8d:b0:ae0:cf01:a9ad with SMTP id a640c23a62f3a-af2f8d4b228mr409250066b.40.1753291257969; Wed, 23 Jul 2025 10:20:57 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:9::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6caf733fsm1082540266b.159.2025.07.23.10.20.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 10:20:57 -0700 (PDT) From: Breno Leitao Date: Wed, 23 Jul 2025 10:20:29 -0700 Subject: [PATCH net-next v3 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: <20250723-netconsole_ref-v3-1-8be9b24e4a99@debian.org> References: <20250723-netconsole_ref-v3-0-8be9b24e4a99@debian.org> In-Reply-To: <20250723-netconsole_ref-v3-0-8be9b24e4a99@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=760; i=leitao@debian.org; h=from:subject:message-id; bh=JNCUvYAKAcYvytYcFZUC0ZZQ+BKoXgzr4rgXZit3ClM=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBogRn2T8QeYxrubimxme4+wOa2iP25+m3GQjOaU IxTeI8PTlKJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaIEZ9gAKCRA1o5Of/Hh3 bVtZEACGe5N+nbAIGUv2s9xowE18Yo+Ue634JeZRWjfbbpPoHAr0Bn12hF/14U+xYyi3hiVyAzk PrCEooBeUfp4whkCyDi/xMbJ8LjJiAacTZDyt6ZxaXqeyfrt1KF6ivAHPJp4HxHuOD9K6F1Zc4b RD5n7IjZG1ycTBa31q8KToecCQrrA6AS6LEzXRKPJd2DEKHsUI9TKQeZBbh3JCRWrSJmOfORMzl zRDF8bYrIOb92Wpzxc8l/XY9+2ZPlnL+iN67gvN1C5m6Z9AlruK3tzvN2LKL/AXA3QfeHQR/UyR n+VBEgBU29TF0OcN5QcR5E77cT5c/9+rY/zlM9/im/4cK83nhqEPft21zn8oLXSEuPQtlFuQ2va qJV6IqqbDIi7kV+fcxlynkYbqE4YV3+ijE790RKdVDG3QW0kP5pBAkRyigfGwANzpA3Bw/GPAJG e54dje+TnKLnsKEWSYtcEH2TX3dPUgJDaN8nTTNKsb0lA+R7NfAwd8OJ0EXU6iOe+zNttLOvoFW +ov8CbmRulO2fdNKQxK4sMAPBCY7N+oVqi34tS+5ylLwFBiaCttWZJiSf7IQpp3JLvZrrBsCRAo ANNiIO70WzMXW5t3hyPyG6SlyVj0WSt9N6KJ2fk0NFjtKKEP8hxt4RZ28OQUhbbJNDD4f39Eq3k SLoskxW6CFXdl2A== 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 06:36:18 2025 Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) (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 5FCC721D3F5; Wed, 23 Jul 2025 17:21:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753291263; cv=none; b=sxYamMGn/uN0brw7eDu6XG4fJW7I1DAvwcH/gmclAaRyfvyvkIUjujLd16D/eslT/ts/69RjSCxCBN/h/iGQsZoza2azdYLAm2f6Kd+cKYaqYL7Q4USqQXsU0lOzJJrxVOpUQ0W1rRrMCe7Jrj3uzdGfC4lm3ZGwO1DeouW9NA0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753291263; c=relaxed/simple; bh=OM3IImDRGqZmUbq5qP8uyYsos+SkAacwLNF9cykp+Uo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=S9IVU3s4W2BMCLVulC/8Ra1WEo7N/alcHRkpraxBWGBIBT5AqNDxXNbbR6qMRm5V9c9OHKNgLZLXX9Ai+4BT4jg4YNA+62syd62sjk8JhOw10gQXp+NfQW24I0ZCsHdwT41SeesRZWCzG66UG+1xctLIT1y7ucFnKx+TJVDSzOg= 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.54 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-f54.google.com with SMTP id 4fb4d7f45d1cf-60cc11b34f6so2209049a12.0; Wed, 23 Jul 2025 10:21:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753291260; x=1753896060; 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=/74Bzq1P0o5+YitmjEt8L3G5nczQsOUBPud/iN6bQu4=; b=Q4hMtBMzYPLRErWN/2PO2HDaZ5oeoher1Rb7/7UePPgiFpUY1e8IGp/wwYFEWM95dw Vc/vjkNY5V19TPnuj7MWtm+fE/H4s++YdbhRLYiUqCYcpfCfE3QyLcCmyd0loWGAx8eg v7Odms7d/H9lW/pBCVcwIA18V8z1p0Pksv0tB6V5mqus9A+yd7nHJQHvfMGmZQXJW2uC Vny1TwFm9iQSTFsAoSMm3/Mu+2H5It4lUYbnqx3r6IX3Gfgo8SWts2AspJnGFbQkHJH1 +ywpMgFkpicsLvWCkw9AmnxrWZp9HYtzUfjqBPLPOwKhT/o0qmpUB1NN82zlNcki2uwu MiSQ== X-Forwarded-Encrypted: i=1; AJvYcCWt6H/ngLIojASOAj0DDfODpTOTGBhZyL9H7lLkKEO4z+d3r6l0xhkh+9cFN3mMCU9sjlT5SINVzKyKgOI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4Jn73T3VE7w/M6ttleb5hUEViVKg/z0drxaWIoOV25yNItQo4 WQ63Ly+LcKrUSSMCo15P4O/piphy86JpxP0/4krrz4jX/r9GwJsIxx2E X-Gm-Gg: ASbGnct7mkcHKJ2S5Bif/gRpa+FpF3LbrFpLdXYdqlsXpSTcHEfSxDUD8x6t+NETzUA 6zZfWvnTx9t9Y7SxonBBZcEbjck4twQRY+C4sdtwHhShLkjJm3BIjjma8LgRHEZg0UwKIx5K/aE 1cMghGq7TAa2MZ5w2Np/ab7xyFq8Qik0yeRj/pS33hYaP5rpFnCWbNPKajcQmcmFlAVaw4haVJL ZQ1GmXhp4qeO6v1M2GjDMCQnZjEJYifrxuT+LLhTyX/wuPpds5QliFZ61zlFBmAVsfxrZ43oxRV v+xPFpTJRqf05XmDxrPklnb3OaJt1RJink60AI2jGNCShTs9UJOlJW2Fd6jvvCUAJ9K7rgfDw2L dUjZ1btew2K4O X-Google-Smtp-Source: AGHT+IGUKM7AP19DWc8FQYi3jxaktMBtD5Ry+WcbHmK+KU2BjYrzuoT/UnpNLN/F/4U6QIlZQ2vqDA== X-Received: by 2002:a17:907:1b08:b0:ae3:c777:6e5e with SMTP id a640c23a62f3a-af2f48b0b06mr271638766b.19.1753291259411; Wed, 23 Jul 2025 10:20:59 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:2::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6ca7d347sm1087745466b.128.2025.07.23.10.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 10:20:58 -0700 (PDT) From: Breno Leitao Date: Wed, 23 Jul 2025 10:20:30 -0700 Subject: [PATCH net-next v3 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: <20250723-netconsole_ref-v3-2-8be9b24e4a99@debian.org> References: <20250723-netconsole_ref-v3-0-8be9b24e4a99@debian.org> In-Reply-To: <20250723-netconsole_ref-v3-0-8be9b24e4a99@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=OM3IImDRGqZmUbq5qP8uyYsos+SkAacwLNF9cykp+Uo=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBogRn2Vnil9wAfl13ASovyAgNOXZ7bzmoqnYgLG 1GJ2xp9kwqJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaIEZ9gAKCRA1o5Of/Hh3 bY9IEAClVEdbFuHwBu6UFP6VfJGRUN08CIcJ1xMr16jJPyEsIASVewdnhtNqyMcCHH8tCL5PUbh ad+7idDo2Joh2K6cdxPiQg6EW88UTFykBRt3gU/TrFwyZ1TF4nbYGFzdbPJtnTlQZQPp9TqJSAR 4iEpKCAlRbeUz0Uzfpj8XgzcJMYjPvK4mdmHifttvEBnJw7KlxLPfHwvo54L+iXjDLsmWbEaUB+ 878D5GxgijC5BBrb7xdFewn2XC9OLVoSmIlu4OF2nNtr91AH2RV3s3pInWV/D+TdFuft7g4uAPd baII/9UTIkYmrsZpP8grzxrld/4pBoubTIo1mDXjORsLbhDI+7AVQCAlXNyQ485av6EdDj5ajTc s1Zg9+8LTe9FBuJTN7l4iP8EldV5ZIO4go1MYdBOPDG2WvmtN5fBi6fRDUQkdo5De54gFJpAd/T K4WA/hLXpAgaunJCRQUq6OgLfj4ATpn2Ta3d7PlLTisrXiytHLnQMnYqOkVfgwCdvVSwHwhGNoI Dlmp//UilabWK9wPQpP8AAULNqx/ETQQDbPrFEzJSleq3k+AnXbEowFXOWyJl0x6IsWHze1My0W IDeABZoWjfPJUhtw7Ts2hLjOgK5Gqv0N0PXufOICrirPZ81jfZ3k/tcQs5+TvnyikF7JlefsXlN Ln1f5ojoSUqYLLQ== 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 06:36:18 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 CBEC42222CA; Wed, 23 Jul 2025 17:21:02 +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=1753291264; cv=none; b=UDQVZ1SY1yKKikb4tKSuOzzCTs3x2vu12+XsiO/Y7vCob3Mf3jAKZR3GVR3LHJRYmrzHP7n/0eQwAG3AECtDcsyV503WVlwAhFCNRDWmSS0gKCTgcEHyPUmVqZD0t3D2JvwRXTpp6EK3MRdszOeO2ASh3B8IE2QLwftgziyuJx4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753291264; c=relaxed/simple; bh=vndjOcu4adrFYip9Xim5uGcPC95/UkUzZbOGN6kmh7o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QWACQrKhzWqyGyXA/IXkY4RqjjaghvFAOsEX9ePPgLFwB+247oXJjKb+vDKN1mqqI5onWCGcBlBYkdWkEZkKPJnAiwhMlCagubjF5Y8GCnPCAfNTZukYKkZeeFcs4olaU95haQaKycrTZplW46gb+Y8mCnjMPEp7TgibuS7OiHI= 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-ae6f8d3bcd4so13104066b.1; Wed, 23 Jul 2025 10:21:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753291261; x=1753896061; 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=CdQWbHQRGyM4Yw1ur1LVGk/Ciq9lP8JnJJ4DCCYMcWM=; b=RFSm8KNIlI5D8hrQ7s/mmKEDJ7sps930ZSAnd9osWNNdrWjsAvdorqZulzeCZt/iET ybe072uWolYwILDA5SH7NeGNV8sz5FBbM3h8f4r8Y5A3pwyNK3Yp5Ad4JGcuVUtSRhEF 81QDVwXXWZew9GL3GUa2uoqzNm5Fwr+93PUTT7jrhaij+5/c7CMw/LdI32nxrSpOyQRV lgAB+L1OZFpM7NvC8eWvQnahYw5oxVMXWc0BxbIoSeuFel6RUaaLj72/7SSQ5zy2uWEN gTUzf0SxK6F6+vwbSJID1WJHTTXDI4BEtY67BaTS4EvphXE9jQ2L2HEvZvMp3/Ryb/cK O3GA== X-Forwarded-Encrypted: i=1; AJvYcCX5gu/UPooXugw6DdHbAuif8zYPOjA2HVmMJbclFp5AK/PH4Uej8JVeHQZ6LgLjaxPBNRqCj+4saQE0+MU=@vger.kernel.org X-Gm-Message-State: AOJu0YzLAMs2xSXfYPVx9inmuCc2dPxUgoTfKI0Vxd2V2MxNsNZeiMcs p4k9ppjrffUGYKcBd/1H6tCd5HwfR+3nce9vES8NNVrEy1lC25l3HQo5 X-Gm-Gg: ASbGncsKQRAKqY+YycYhyQIJHyEoXXDhBi5LfibK5eDRunl5arRSYD7heObXG8MVVpG Re2RshoB/TEJtkXGMIhEXR41rmLyuqA+K+EK0wWNQVfb9aWDqpdlm1n78QW0VKlJi8RNWzDWYsz U9AN1B64AqcYUI+loW/YM1+c2tGu3xAjab1ncsboULFYjfP2OGFo9QM3+SzuYv8WQG8aJSA4JWl 5VGGJQOsJS8jPjbyfQZrLImYm7nPz/yctBIV7EuXGW6TE5rTn/+EzRWXCQYMedYP/orsKwyVqix 8c8zGUmQrS8hwD4YPp9RdMpQfndSQ3kx0CgyDJF8SuYecyCrWu81C7zP4cgBqKfZ3Qm8FRQVzGC pQg8MDIu95sNL X-Google-Smtp-Source: AGHT+IHK0kDY6xp1rYbRbEGibfSqaAzPKJiupbMocm8yHu99g0PO1zFPtJbzt5ooB9tF03lhPZYIyA== X-Received: by 2002:a17:907:60cc:b0:ae0:b3cd:b7f8 with SMTP id a640c23a62f3a-af2f8c54db0mr401571266b.40.1753291260916; Wed, 23 Jul 2025 10:21:00 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:4::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6c79d6c6sm1082545966b.32.2025.07.23.10.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 10:21:00 -0700 (PDT) From: Breno Leitao Date: Wed, 23 Jul 2025 10:20:31 -0700 Subject: [PATCH net-next v3 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: <20250723-netconsole_ref-v3-3-8be9b24e4a99@debian.org> References: <20250723-netconsole_ref-v3-0-8be9b24e4a99@debian.org> In-Reply-To: <20250723-netconsole_ref-v3-0-8be9b24e4a99@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=1644; i=leitao@debian.org; h=from:subject:message-id; bh=vndjOcu4adrFYip9Xim5uGcPC95/UkUzZbOGN6kmh7o=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBogRn3vbT6Id/9UPC5YdZ9Y8MYCnkTyWevYQWHr c/Cl7Lyg6CJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaIEZ9wAKCRA1o5Of/Hh3 bWfOD/9F//4EapQpC4tbnTZhMi5ClQRfY53DiTkkDrFBDE5+lxmpfDBlthsCsvGJVqPXwo0wPbJ HCKKTTeVBgRiUC5rfPMsXLfDG7frs2DMrvQI7iR9AAnNNMougUXBQUmFffNP0ohq2e/NRRFl6Mm IDZJOfQ248RVAAvflgCiCa+3yk7TLiokdLWjYo0Dyi8S7M4Xq4hVoX6jfyug3OqOyVLeQE6mn29 f6lX+yGPgM5iMruHwDQYhjCsUuvtD/trxUO5E7oZB0ZDdYMfPQ8z/YCAOFJcy8VaxpWBIam/v39 xAuG/LFC87oRzHNFOkcFidhdWzoGm5MTMkpHvOIBs4+5b6Ctt0LdCRWLXvSVV/W+Iba5lbg/QgS M6mmRBpxwGjANXEBpMNi98KkdTSYh7dy99lDqwPBKrfyGciUW0VOow7fV/AWsV7otYsvRHhw+EY 28NRMenGZqzLakq35oW4dFIs+MXSCVzlmWZkdmJy9DF6BWU9E3Qra1oHHbaOOaR7wsWYn8+LyHu FKNv6sepqXr45Hm+PwHmbsDkbnZkS0ZHpl5SbWYlXSRkMfZonnNfzH9RJtOibes/T9WyXITAFCe pvC/8XK9LsXPtUitrz0iGKZwMnd8cbtmPKTEUzniX9ZuJYfV9x+KdUj+rwYj+sBFXU+hpxL0igO LDN4ECLVqN4WQcQ== 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 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 8d1b93264e0fd..3188cc180a934 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -303,20 +303,20 @@ static void netconsole_print_banner(struct netpoll *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; -#endif - } + + 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) && + in6_pton(str, len, addr->in6.s6_addr, -1, &end) > 0) + return 1; return -1; } =20 --=20 2.47.1 From nobody Mon Oct 6 06:36:18 2025 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.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 645A1225A37; Wed, 23 Jul 2025 17:21:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753291266; cv=none; b=a9XGDICdvxUfFiviYWvTyMvuKVtF7pDAXPxErobxfaSp7TN4lUPLDKz/75i32pXJbjja7uRK4TQNNFXJaJNgGw9wD/Uk8fTbFjcduwhzqaq3lMD2n2eGD2WxBk5ZB06/UXA2PU/jz+p7YrI3Ok6q0cm4NfUlZQ3Ynr/WNP6VgNI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753291266; c=relaxed/simple; bh=PKuplVShqQgUiUiYmqCsm0Ep2rLtTzG/Uy2yvfQ69Yk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AeGkkspLW6f5oVdSp22nzaJOtpzY/Udx0KMwVofz9Lj31SHH5quVU2UXNDEekL/0YbK6Gx497blxKw/IGQ5uVSs2NG9doV+0qXtbkvChK4bZZ7rulONlsE6CeZgCxseD/IJ/5G1IC6w8MbA26sNWlrd0YAJQbqGY014pMlrGYsg= 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.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-ej1-f42.google.com with SMTP id a640c23a62f3a-aef575ad59eso10851766b.2; Wed, 23 Jul 2025 10:21:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753291262; x=1753896062; 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=w1uCm8jNm69saJYHGnelConPUrdm7lb5x3hDmLAwVeg=; b=HBAPsrlKjR3oPp/raQXvrHjGGaOjOoSHx52TeEifnNVnj3fFsRQ3aLROnSwQauuoUp OuVxt36xf3raPmsUm7CNsu1ZeHVOA3bRw67vOXZ8uMNMS68s28dhEO8rbZQTmSHG20N1 LYkDdnWCtjdHUkuLwRvglv45KEJ8K8rsWCFy2FN3FxyP0zDmsI3fvu3C1vyWINWSl6uC nQ7Ex9ZLWgc8m7YaCi6xtYz/jPT8pWo4gfZpZhA/bA8bRunojGPtKCkJWGb1lO+AIjc6 5V3IAkSi/wmqekTffA/xiUa3D0ZCW763Fi6xL+37nWT356P77wrZhlHpLsDGgk8quVyY I3OA== X-Forwarded-Encrypted: i=1; AJvYcCWDKJtlTl06lYwF2YslJwz7EKr2+JW18DAph4fnmLnuAYBJyVSsTotCkdnOv4vtQMP+b6QI0rughOZJV4E=@vger.kernel.org X-Gm-Message-State: AOJu0YyKkN5qhpwr1TxXgd1SlHcVnvElbH3WRP/0m/eqlcD/NDkx1sJ9 5Hvr6rzvpItR9ufsgNIwMmxcVJ7UTqmJQrMx0fhtKtwZKKhOzja1TK5E X-Gm-Gg: ASbGnctZ36w4h6N5g++TlN133YR0i+uk98i9q306ybrhn89wScp3/nlDFsWVaj6X3lP ijk7JkVfvgU67AIRCRUIdrzc7x3DJ3JoZrH70HL/ZxyvWyIEFB8v9Yt7xZ++9nCl/4mfrkeEXBE uEjjswB74QmRAbn6HhFRu04gOHjI+fmfpRzs9c1ru4V7qcak5fFVolCeCPlKsaxpCOUlg7svSp1 dN//D/bUK8ZAgo9dzxrw/1HADC047Lq1dvlax5Fwq3qM4uxlTn9J4P6eW6g80+2lRb7KQJCvQvQ TqYrDA5nP+GGpTuqwheUubO5w4nkqE1BXIrCOsMWZQNpHk7CgKNRVm6tyZI+rFS2QR6dn6VIRia WAWvbV4GsEvXr X-Google-Smtp-Source: AGHT+IGfM+1p2Dvzf4NOq56w14dkXsry5rausath6PXKeZSndp1DlN8/hN0oeWHCZU2OYcovwVY/1Q== X-Received: by 2002:a17:907:3d16:b0:aec:5a71:4513 with SMTP id a640c23a62f3a-af2f66c2081mr435303866b.4.1753291262299; Wed, 23 Jul 2025 10:21:02 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:3::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6c3d9178sm1073645366b.0.2025.07.23.10.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 10:21:01 -0700 (PDT) From: Breno Leitao Date: Wed, 23 Jul 2025 10:20:32 -0700 Subject: [PATCH net-next v3 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: <20250723-netconsole_ref-v3-4-8be9b24e4a99@debian.org> References: <20250723-netconsole_ref-v3-0-8be9b24e4a99@debian.org> In-Reply-To: <20250723-netconsole_ref-v3-0-8be9b24e4a99@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=PKuplVShqQgUiUiYmqCsm0Ep2rLtTzG/Uy2yvfQ69Yk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBogRn3JP1kA19ixcPt9z7HZXtLrfdqVZWu7b0re kFBP8gAdnGJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaIEZ9wAKCRA1o5Of/Hh3 bWWeEACwH6eVuy3tbCT0c81t8Ju2pGeTebpHJHCwdvYLMCwCNgq5BEKW9AgLhuhdFIw1XfKmTW9 mdTqF/63W0+iC7uBkOnXx93RxJsFF8/VLfHo6eQuQqEQccdGhSURKfkabhnE9WL6Ro2BLbyz+fg 20H1Hrv5hkL6K6EyBSPWeDWV3i61I+UGcUe3dB02kBw0Lwp1ie2Htbdtq4PmrYP7Up4Ky84ldhh CYXWtXncrTI+7UFLdLl8vutt7aiuFpn6RJnT22rOEDy/pe26wkt+UiNllqspKkKZsez7k37nlHs 3gxQZlikFU3bc6SjNqGdAzvwjNDjixMS+pmZ3cLkIAUQg4Flh5DNIUBKSD9ZwYmlzOBjdM7wulh cgThFz7kRx60onGxPfbe7j7U9ECeMIVoOAAccTqrN8fsAcC02L/211qw6U2vf4UFQmVcD1qwv07 BalA9AOfB5OumZWtzz4i/Sl8cgZA2Rq7dy/MqfsD2wMwwnrE5hSH7GmsnaxmiTYC/Mrgo27bCs9 AYMiUn1Q4Wh3tPvbTHhTqw832cffQUyKfvAcmiMBlCfqJy/C2toJszyqKwlt5iSZfZMjeke7YH0 aXBVyBZg7F8UAwjuRd1YYDrlhYHDPGuw3gMBoHVhRo5nmEd/W63vsCsYyjokBCly1MS+249m1xR NY8NHnMhT+YYV9Q== 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 3188cc180a934..358db590a5046 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -750,6 +750,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) { @@ -758,23 +759,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 06:36:18 2025 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (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 9AC0D228CB8; Wed, 23 Jul 2025 17:21:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753291267; cv=none; b=UplDdYTTCsjJc1BMR7QtEPnienpGZ9vr/OwmCIMJO4CPES09TDzEAp+zWduWzdlMQtp0wfuiIv0TAxw3f3nCzn++LDiznS6Mc7Ad93DzvczjSUkC9tCKDOiHV+234/j0uVTBvEjlQb9Ttvc5Jp9/zeaNJ2EDYYPE0fFsXkiXgjc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753291267; c=relaxed/simple; bh=nguDrM0leEHBq0w7xffcJG4/xal3jI5Q+mFldOTxOoc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=D5dG5Q/vt7gXGNXcLji2Ft9C76QP3tSDTz12ObrwhaVPtmdEEl/ntyVEDo7RX3etpnXOMGPXCDdlLOOrZPrM4lmHt5Ful954ip8wk7/g8iGjcdiOrzO2SASxhSTbL47D256cjwHalpPuXQNAJL9xHCS475Gr0gdPL6wguwZ658U= 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.41 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-f41.google.com with SMTP id a640c23a62f3a-ae3cd8fdd77so14973666b.1; Wed, 23 Jul 2025 10:21:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753291264; x=1753896064; 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=UganVJsRCwC7ZF0STQTZO3KVXTs10kIxoj5lxh6bhws=; b=AhKQsVuuAjsciVUSS9N5fFo9w4MzjQ9+pES4KCAFAe23UBhKzbzc6rKVfUNKoDjVzY Q5YfZphBKcrXzP3y44aZdlXpdGo5+MwqE+xtzIZGyzztaILgJEvJRZXim3/msLsOqutV Z6oRjMcP5ok0zji/GqeUAue1bM26BXYNX19ATvvF36uORoxLCgpVOazI6thhUdF31SG4 pSHCKjddyvncTGlvO3Da/Liv29Xz0BeL4uiGKI+d3IfRV2XwoQ1NP8LJ3qqQjjoYhOra 06twCZ8RsiqWn/OzIon5023RgDozLffjz3hNzgWsr7RClHE3wdmdV1SrN/tNnt7fAVYd wL9g== X-Forwarded-Encrypted: i=1; AJvYcCV8Q+jbZqzRTl4iNJp+kwxQ87cDtuOMmESmyrEop3PaWy59ZtyqNIt5MLMLTQU9PP9puaw37gwcJ2Bcgxg=@vger.kernel.org X-Gm-Message-State: AOJu0YxGGI/X5xvgIklFvKKM6OvSSOpbBJOBpHqakLfwsyxe9Q4b0n/m Q6Fr7luz+tMtIEBOKtNjBQRG3NqcS7RPV621ApGwTCT+C3Q2YhuFZQN6 X-Gm-Gg: ASbGncu+pS5biXo4dVyKs21GTVDN5qQsqj8XChLJqx7isOPC2b6ZCYgJ4NVvsWjyOnK OkTH+Xr2RSS39U5rD+oA5x0uiYaqWn6kRh+Zy6Qq/265orQaIXKEVWug0gs6DLwPVzSPmVZfnvb cPz0JlWtty24dAGQK1Jr23p3IUhk+cKXsKxUORGs97BUfUvgJd+9pUA29VI3qr65sa6Ql0pukl0 7aANJTiagmvHpU3+emS3qgfXk+IIcrc+iXdI7h55WK4Tf8TMzW4+vRrHCLrGhhCZiIq6byp/Yim PZL6SwnGlbSESzBBYOM3Qj/w+hlmNRi+UDoms87iCKmd/3rb3DCncgKdMxp01+kMfSTF39VG2QE TZs8BwLeWJ4+9 X-Google-Smtp-Source: AGHT+IFb1L7Q/2kG8/sUIMK7WmvK4HQLRZ483cU1yV4JWbXeLbcQus3B/CI2hqSW6KzG0eZ4kJM4zw== X-Received: by 2002:a17:907:9409:b0:ae8:e6f9:7cf with SMTP id a640c23a62f3a-af2f6c0af6amr378904666b.23.1753291263715; Wed, 23 Jul 2025 10:21:03 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:3::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6c79d6c6sm1082551266b.32.2025.07.23.10.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jul 2025 10:21:03 -0700 (PDT) From: Breno Leitao Date: Wed, 23 Jul 2025 10:20:33 -0700 Subject: [PATCH net-next v3 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: <20250723-netconsole_ref-v3-5-8be9b24e4a99@debian.org> References: <20250723-netconsole_ref-v3-0-8be9b24e4a99@debian.org> In-Reply-To: <20250723-netconsole_ref-v3-0-8be9b24e4a99@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=nguDrM0leEHBq0w7xffcJG4/xal3jI5Q+mFldOTxOoc=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBogRn3ZmHdjG+Ae3bE9OD0bm2x1cP2UjX22/c0k NocQK2J/6CJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCaIEZ9wAKCRA1o5Of/Hh3 bVDMD/9DYWYpodEJDjKbWknVtvuQazGZpnIsRMz4WBM4mWS/njRSRVsKdv//lrX5qed+ZpjDUbH 3C5i2ebPXX2ssaaZuKDfGJNFD2vOBHVLzPtZIVBSjR1Cv9cioZW9b2J58iK/Dzij0m/FAS5dFiJ 5CBv8louQ6jNTqTIDtVYR52BZD4sgUNdxqhVgkvZi98Zg3JLKDXRyQP7PIrcJMiIwg4/Q2XxK6z d2v9Ftv+YOxpBBz7tg/CXFZzvF6pq9TIaWFehiiJ+YTWhuMGm32zRjhW7FQC1klUqoEzCDrdR94 kOoXtU3EIGr7xdk94T31RuFeTKPnwPFhGxwomIoU1Wxx+l9xJeKucgATPDoAUYN5l19o+bDpusA hTCdQ/QUNpqtPmtVoFC7Qni8WFGksyByKGd0k2wWzc1aF8v02sZRF8Szw4Dv3ZbHccs6SazbiHM 7JSj2txk1THF7BbQ+n2wYJBDU1/z8LmCPSSqV3kMZnwUieymE57vEHsq90DbIZD/YP5g3ZBcr/o d/If8KpdMUrK1gJ3Gw36vlmIvY5/aBCVXypsOq0lurlsu/F5pEPSdFvSUh6otqDIKLZcdnVZKWf klHtIApjrJe2oOh5Q4sX/vl+oXp/WJrgVA9XONu6P81uZWYOPtVhfvtMTuKf3aKOQBxHqtMQNZN 5uG64v+i3LiN+/g== 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 358db590a5046..ef7d385a28151 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -775,6 +775,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) { @@ -783,23 +784,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