From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A3D03AB28E for ; Wed, 8 Jul 2026 20:39:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783543148; cv=none; b=NOTnJXTjJaczLHmbncFVRpRLi1HXT1XDpoAUYzJyvd17AwsBainAkRsFkI/KayQC5OPu8rzpN0X+OiFnV6wurS1F3hCAenud/JkvbtjBi98buVq1sp4Ni1uS1RHngGVQgm8UvXVpavPyNJ3VhMTyTQXX8LiVUYL0R7hlqbXGxbc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783543148; c=relaxed/simple; bh=SPyf1sVRImYy025lzafai3puMJ9u2Ehpp+yOSZGkUJU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=EDeNGpe59NWxHEb1O1+Kih5F9IwpWD+LUI3CPTcUGrZiMEu47o7PGO18QHgkj9fiPaGZ3jR7iFWXc2Ht59zw5Tn63xCkMjPetCI++zgSVYh3DoaaMkgO6SNgzBcqOeIdEItI8bno9bDV2NviUbNdIIDpIHsGnHqlI89nNa9F/4k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ionos.com; spf=pass smtp.mailfrom=ionos.com; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b=gxAdgQAS; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ionos.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionos.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="gxAdgQAS" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-47d6c634f45so86085f8f.3 for ; Wed, 08 Jul 2026 13:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1783543144; x=1784147944; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=L6HVoHiWWa30jPC1xil3MwgrmH/xxywgrreM6/9IQpQ=; b=gxAdgQASacs+/+NT1nXeh4zl8Qjm8QU1mv5XD8hZocU1cPtGuuoIZ9wcyrt2i6h0r/ nX/nl5460+X3b7hwZO0oYHGptdMq/NFFS8k/hyf7dkv353EJBTeeHLOcX17ADJspfmRX rq8Y6IS0o8MF/PikGtozQfKTH7CzNTtHNyg4VJvD6CA8fU/HJWTk21LVNc6q8UxuvA/M 3lw1MoJs/1tBqVPZVUqeQC+Zi7Uf9xR/VMjAn7mz+ARklEE/h592krJ4eVAWzWGgTjX3 crP13bzUpTJ9oVP710DZRuF4b0Sw93IFxJ0dRcn6JY6PSheEWPx2q7AsfYel+BMgeAqH Lo5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783543144; x=1784147944; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=L6HVoHiWWa30jPC1xil3MwgrmH/xxywgrreM6/9IQpQ=; b=plqgUQHDTJVqpBkgJhuYar5JlGWkTjOVSDWwlpcsU6ikPGZ1T6ndSoZxNFHoIiBlwU 7rtqA+C0nVl0saXPt3WA1rI+tt7/2+fSFLqyqUL7tAO5ioZp/bHY8Yyyo9lc8fTJFAca UraUQRCYUQ9eJ1rF6OxPQTi//fXqgi9PVjerCKc7Ti0Az8BcoHKw7AtgMP+s+uLEMa2q d9Tog4+G8fhcuikssHz5hWdaEj1JQAO7+JObfPKYB9qi6/d4QGtjTOvszA551jYFjHux zNnAGauPSaFI+Jlj1hepA/stZn5Wujs/0D7aogdN2LAAvnUTFFl7f3iaLHn5NUTeuQPC FlBw== X-Forwarded-Encrypted: i=1; AHgh+Rpy8k2Oc6jHLQZ/u5BQCmPpfWuqMFNUGmjSXr97EIh/4Z7KiT+0l3cj2h3JF6R5jggU2gS3weazxW/R30A=@vger.kernel.org X-Gm-Message-State: AOJu0YwGESwxhM6ZB/6pcyveLcLSa9oHLm3GZeOWT3i14COnJdu32w4P cgAwNDRIIbDCZzpKN2/sA4BraO5F8FhbHY0Vmjf9tejn3YGHfFldvnioarvc6YGesdY= X-Gm-Gg: AfdE7cm38RsGvqIViCTq0InQqMqrtYWEijvVAYGVHDXn3EOXgEbIxVZpB2WccGwxyMs oXWyPJoYFT5wcoFiu0FDLJT68A472WOhvYFAKC0IMKISqavSDIb9UZySuiYTezWO0Rb7vUOqTMT vCDETNaJIuHQ78kmZE6OrBlzgdjixBkAv19gs5sUi8cRKGcwjhVgyOz1fNaFQPuAizfmn5H0a7X DG9reWU3NwFwCKbEDMLdvXBAAyADrhIB5JyI4g9srjPsg1XCyKNYHEVXNSDvND+fmqeNBnoMX1S Jb5Kt/Ol2RSDhRsAgHpt4DYZDy76LAFMGosNGBaueYbVaXRE2xExI5W7VuBmXOgPon4VS7eta+T DI8X+L9tVcD+xHV09kBaEH9kwOS5MvmsRz0ulmIQxIEXUCFzlwZzzX6vwKCyOazU5gvK07+AqSN 5CPSIxtfIEZBmUYyO/bY11JsYXYagSlZ1Jzfv55vRcghPAROwIjkamJeJn0Lbee04kEykvkzK95 T5Hw5pD+fPQ0GvGwbNTtGHQRcU= X-Received: by 2002:a05:6000:2003:b0:46d:d5da:f0a9 with SMTP id ffacd0b85a97d-47df077f4abmr4408683f8f.44.1783543143899; Wed, 08 Jul 2026 13:39:03 -0700 (PDT) Received: from raven.intern.cm-ag (p200300dc6f45eb00023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f45:eb00:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47ad69519c2sm48721570f8f.37.2026.07.08.13.39.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 13:39:03 -0700 (PDT) From: Max Kellermann To: idryomov@gmail.com, amarkuze@redhat.com, ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v3] net/ceph/messenger: support IPv6 Link-Local with scope identifier Date: Wed, 8 Jul 2026 22:38:58 +0200 Message-ID: <20260708203858.263229-1-max.kellermann@ionos.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Implement ceph_pton() using inet_pton_with_scope(). This minimal patch preserves the ceph_pton() API and thus requires copying the parameter to a null-terminated string. Signed-off-by: Max Kellermann --- v1->v2: - check "ipend" before dereferencing it v2->v3: - fix indentation - use the caller's network namespace instead of init_ns - stop parsing at the port separator Signed-off-by: Max Kellermann --- net/ceph/messenger.c | 45 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 34b3097b4c7b..21dfff074e7d 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -1221,19 +1221,46 @@ void ceph_addr_set_port(struct ceph_entity_addr *addr, int p) static int ceph_pton(const char *str, size_t len, struct ceph_entity_addr *addr, char delim, const char **ipend) { - memset(&addr->in_addr, 0, sizeof(addr->in_addr)); + const char *delim_p; + char *copy; + struct sockaddr_storage stor = { 0 }; + int ret; - if (in4_pton(str, len, (u8 *)&((struct sockaddr_in *)&addr->in_addr)->sin_addr.s_addr, delim, ipend)) { - put_unaligned(AF_INET, &addr->in_addr.ss_family); - return 0; - } + delim_p = memchr(str, delim, len); + if (delim_p) + /* delimiter was found - stop parsing there */ + len = delim_p - str; - if (in6_pton(str, len, (u8 *)&((struct sockaddr_in6 *)&addr->in_addr)->sin6_addr.s6_addr, delim, ipend)) { - put_unaligned(AF_INET6, &addr->in_addr.ss_family); - return 0; + delim_p = memchr(str, ':', len); + if (delim_p && !memchr(delim_p + 1, ':', str + len - delim_p - 1)) + /* a single colon was found - stop parsing there + * because the caller wants to parse the port + * number + */ + len = delim_p - str; + + /* the input string might not be null terminated, so copy it + * to a null-terminated string + */ + copy = kstrndup(str, len, GFP_NOFS); + if (!copy) + return -ENOMEM; + + ret = inet_pton_with_scope(current->nsproxy->net_ns, AF_UNSPEC, copy, NULL, &stor); + kfree(copy); + + if (!ret) { + /* ceph_entity_addr might be misaligned, so we have to + * parse to a stack variable first + */ + memcpy(&addr->in_addr, &stor, sizeof(stor)); + + /* return the end of the parsed portion to the caller on success */ + if (ipend) + *ipend = str + len; } - return -EINVAL; + return ret; } /* -- 2.47.3