From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 05792390230 for ; Mon, 6 Jul 2026 07:44:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783323856; cv=none; b=WS9KWut6LTonL1EZgy7ixT5livrRC6a6Q1tnJWaK0iTPcJBEl7htmQb2c6bqTenzQwt5IAQKFgw3BHNtmYl0sbuqQi6hBlszYAwpFz2Q0ZIUv80xRXqir96GKhRQDQhFxI7OrpR9lL7DzWMTD0hCq+SrnTBCspFJI3YoYrB7Y6g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783323856; c=relaxed/simple; bh=kp2tve8yg97eVe6KN1fHwiiuqPKpUBdKCRpEc807+Zg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=o66nHCOI80p63p0Cn7Ul+3dg6lnV3CwdL0Ky6/zUu4yLhrtOL49twnV6P6weRatW+VFQB0vga6qnLb1tzcFcCVpL6JK3udYmwy54/mSbS5n0RSg6GcO9VUA1vkKMBxy7DnwDNqDH1zD3xJVj65vnZ5/qdyAFPMJerIZ5kE2leW4= 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=cX2ezPkQ; arc=none smtp.client-ip=209.85.128.43 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="cX2ezPkQ" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-493bb510ce4so19796375e9.1 for ; Mon, 06 Jul 2026 00:44:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1783323847; x=1783928647; 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; bh=Mv56uqMTa5ltTK3hth49y7o1dis60eGd+zlFNk3yu/Y=; b=cX2ezPkQAMcQbHPSzTw77+JYRyGtOh0oFExsMYVISw5Nqm9qGYhpmT7x2+5SMDactL D6IG0YQJ1J5s/1ioEvn2TVNcJ6S0WugylG8y6iYmwCF5WKSI2UBm6H5+kVlQj4JbPbwO b47aHrN6cmdlyGq2XAxRQru1zmxjdvHxemiX4jAabfOvWO6fjPvG64frd4MnH/dxziD6 cFTIalb2/UYuVn3WBl+YfVTFEgBSAz9h8H5XZrUQYrEHUz3XiKP0ZCBjn5PFTpc6z5yT dtu/tOjGOlLsZomwAuuYXNp4yL+ffkGBkBTfbDpd7uXBUnAlTJ2NnGFTrMd00W0L2IXw s7zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783323847; x=1783928647; 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; bh=Mv56uqMTa5ltTK3hth49y7o1dis60eGd+zlFNk3yu/Y=; b=DsBgkCpj/ANSFoL0zpoJXrcAas6vPhDCCpoHOUP3/BT0fQd6r0J1Jhb7iDQFW2aGfn vqxtjJK/wJHk19Cp+yGKjiNW/gZNTtdgjZ8bbf+8Nn+rp7vIyTpdhl13nFKH1wfwzBOS CKLB8o+4y2+TGT8bMG6KsijjkGh0JP+Ib46Q+vs+DwLZ00Ykhhov1rEvMfpgVyBmeKH/ sy6quCPNTzlP8ePL1d9AQS2j0xxq/UsW+YXYP4KXLg4tZuaM0FTS3/xX9e8bYBi5Up0N 2gWcEhOcrIYU96tZqCVKYFQW3pm3iBnVQj8JviRfbW6Lg981STY8MnIQbbqaE5IwZr1l sn/A== X-Forwarded-Encrypted: i=1; AHgh+RocL2krkrIYvQqLgTuCOdXur2mIERRZWSpLEyDieY86vvJhaGB2u8/I1PXIepzI3egmcRXJQJAlKOm5obc=@vger.kernel.org X-Gm-Message-State: AOJu0YxR2D/0RLMiWVNCflayK3Mu4m4E/4qSd69/in9M5Nomu/piR5gy IsbzCKSulzMU9SWNzT9xjUFeYDCIK5nrt+XMTMnelTkgVWygjJXWZ5clgwAdWIVMtoM= X-Gm-Gg: AfdE7clESLFoZYKhUXvib9kI/J69noGrb+a/8S5m9tvHu43rBXxCy5MoYN6wFOV/REg bmsbcTKtKQYevxCfGE/t5cY1U0etL+1tw2g+YYHBaXw8uHLi/Gd/rt9pCx5OEGWpPpZCT/Vidju c9JUHjP16g3meqWki6dE8snN09N7HX4dpvQiSGF700Gu7lhsy37igFhxu7kaR6fpupw6Oxkalp/ P6L+QdiIbzpJMf2VwjfjzC4B3/xc/ID/co4kj5OIhmVNY1cnCUo0QjHtMzpmCcWTPygu40Pk5v2 xQ2PGDcvMgdItz5MxoOjj1qs+ctzsFjBhavcM69MDgh8ObfUrmcZYP74AHBSrcbO+gjYhKITtW5 NH5dluXbVN05G5y5vGIh0eYkFsQe5R4lsH8SWfpMgIGl7qDDjAhlqD4U9t3cDT8seoZ5RptxLT2 5vGQnXPEet5v7cAMEUA48LQo2M69xFDz65XxS+Q2PfW1fBn1YHyF32sgRbZoLk0Ulxgnni0xALd MxVphghoYcxawWb X-Received: by 2002:a05:600c:3493:b0:492:4363:e7d6 with SMTP id 5b1f17b1804b1-493d11fdfaamr99814865e9.37.1783323847595; Mon, 06 Jul 2026 00:44:07 -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 5b1f17b1804b1-493c63bfba1sm400517035e9.15.2026.07.06.00.44.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 00:44:07 -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 v2] net/ceph/messenger: support IPv6 Link-Local with scope identifier Date: Mon, 6 Jul 2026 09:44:02 +0200 Message-ID: <20260706074402.3927113-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 --- net/ceph/messenger.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 34b3097b4c7b..f7c7179589af 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -1221,19 +1221,38 @@ 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; + /* 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(&init_net, 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