net/ceph/messenger: support IPv6 Link-Local with scope identifier
PATCH 1/1 net/ceph/messenger: support IPv6 Link-Local with scope identifier
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.
--- net/ceph/messenger.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-)
net/ceph/messenger.c +27 -9
@@ -1221,19 +1221,37 @@ 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 */ + *ipend = str + len; } -return -EINVAL ; +return ret; }/*
Signature · 1 line
2.47.3
Alex Markuze
maintainerHi Max,
NACK for now. Thanks for the patch, but I have some concerns that need a v2:
1. [critical] net/ceph/messenger.c:1251: NULL pointer dereference via ceph_dns_resolve_name
2. [major] net/ceph/messenger.c:1251: IPv4 port parsing regression
3. [major] net/ceph/messenger.c:1243: Scope resolution uses init_net instead of caller's namespace
Signature · 1 line
Alex Markuze
Quoted 8 lines · Alex Markuze
Hi Max,
NACK for now. Thanks for the patch, but I have some concerns that need a v2:
1. [critical]
net/ceph/messenger.c:1251: NULL pointer dereference viaceph_dns_resolve_name
2. [major]net/ceph/messenger.c:1251: IPv4 port parsing regression
Need more information on these.
Signature · 8 lines
Max Kellermann Principal Architect Hosting Technology cm4all | Im Mediapark 6a | 50670 Köln | Germany General information about the company can be found here: https://www.cm4all.com/impressum A member of the IONOS Group