From 743a9783d57ea6b693e56f6545ac5d68dc9242c7 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Thu, 12 Sep 2013 15:49:36 +0200 Subject: [PATCH] ITS#7694 Fix use of IPv6 with LDAP_CONNECTIONLESS LDAP_CONNECTIONLESS code assumed that the size of an peer address is equal to or smaller than sizeof (struct sockaddr). Fix to use struct sockaddr_storage instead which is intended for this purpose. Use getnameinfo() where appropriate so we don't assume anything about the contents of struct sockaddr --- libraries/liblber/sockbuf.c | 16 ++++++++-------- libraries/libldap/abandon.c | 2 +- libraries/libldap/open.c | 4 ++-- libraries/libldap/os-ip.c | 4 ++-- libraries/libldap/request.c | 2 +- libraries/libldap/result.c | 4 ++-- libraries/libldap/search.c | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libraries/liblber/sockbuf.c b/libraries/liblber/sockbuf.c index d997e92910..858c94204c 100644 --- a/libraries/liblber/sockbuf.c +++ b/libraries/liblber/sockbuf.c @@ -888,8 +888,8 @@ Sockbuf_IO ber_sockbuf_io_debug = { * * All I/O at this level must be atomic. For ease of use, the sb_readahead * must be used above this module. All data reads and writes are prefixed - * with a sockaddr containing the address of the remote entity. Upper levels - * must read and write this sockaddr before doing the usual ber_printf/scanf + * with a sockaddr_storage containing the address of the remote entity. Upper levels + * must read and write this sockaddr_storage before doing the usual ber_printf/scanf * operations on LDAP messages. */ @@ -914,13 +914,13 @@ sb_dgram_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len ) assert( SOCKBUF_VALID( sbiod->sbiod_sb ) ); assert( buf != NULL ); - addrlen = sizeof( struct sockaddr ); + addrlen = sizeof( struct sockaddr_storage ); src = buf; buf = (char *) buf + addrlen; len -= addrlen; rc = recvfrom( sbiod->sbiod_sb->sb_fd, buf, len, 0, src, &addrlen ); - return rc > 0 ? rc+sizeof(struct sockaddr) : rc; + return rc > 0 ? rc+sizeof(struct sockaddr_storage) : rc; } static ber_slen_t @@ -934,11 +934,11 @@ sb_dgram_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len ) assert( buf != NULL ); dst = buf; - buf = (char *) buf + sizeof( struct sockaddr ); - len -= sizeof( struct sockaddr ); + buf = (char *) buf + sizeof( struct sockaddr_storage ); + len -= sizeof( struct sockaddr_storage ); rc = sendto( sbiod->sbiod_sb->sb_fd, buf, len, 0, dst, - sizeof( struct sockaddr ) ); + sizeof( struct sockaddr_storage ) ); if ( rc < 0 ) return -1; @@ -949,7 +949,7 @@ sb_dgram_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len ) # endif return -1; } - rc = len + sizeof(struct sockaddr); + rc = len + sizeof(struct sockaddr_storage); return rc; } diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c index d999b073a1..8fd9bc2587 100644 --- a/libraries/libldap/abandon.c +++ b/libraries/libldap/abandon.c @@ -209,7 +209,7 @@ start_again:; LDAP_NEXT_MSGID(ld, i); #ifdef LDAP_CONNECTIONLESS if ( LDAP_IS_UDP(ld) ) { - struct sockaddr sa = {0}; + struct sockaddr_storage sa = {0}; /* dummy, filled with ldo_peer in request.c */ err = ber_write( ber, (char *) &sa, sizeof(sa), 0 ); } diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c index ba10939975..ac35e99f3a 100644 --- a/libraries/libldap/open.c +++ b/libraries/libldap/open.c @@ -314,8 +314,8 @@ ldap_init_fd( LDAP_IS_UDP(ld) = 1; if( ld->ld_options.ldo_peer ) ldap_memfree( ld->ld_options.ldo_peer ); - ld->ld_options.ldo_peer = ldap_memalloc( sizeof( struct sockaddr ) ); - len = sizeof( struct sockaddr ); + ld->ld_options.ldo_peer = ldap_memcalloc( 1, sizeof( struct sockaddr_storage ) ); + len = sizeof( struct sockaddr_storage ); if( getpeername ( fd, ld->ld_options.ldo_peer, &len ) < 0) { ldap_unbind_ext( ld, NULL, NULL ); return( AC_SOCKET_ERROR ); diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c index b31e05dc9b..90b92dfe63 100644 --- a/libraries/libldap/os-ip.c +++ b/libraries/libldap/os-ip.c @@ -422,8 +422,8 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s, if (LDAP_IS_UDP(ld)) { if (ld->ld_options.ldo_peer) ldap_memfree(ld->ld_options.ldo_peer); - ld->ld_options.ldo_peer=ldap_memalloc(sizeof(struct sockaddr)); - AC_MEMCPY(ld->ld_options.ldo_peer,sin,sizeof(struct sockaddr)); + ld->ld_options.ldo_peer=ldap_memcalloc(1, sizeof(struct sockaddr_storage)); + AC_MEMCPY(ld->ld_options.ldo_peer,sin,addrlen); return ( 0 ); } #endif diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c index fc2f4d0631..4822a63432 100644 --- a/libraries/libldap/request.c +++ b/libraries/libldap/request.c @@ -308,7 +308,7 @@ ldap_send_server_request( ber_rewind( &tmpber ); LDAP_MUTEX_LOCK( &ld->ld_options.ldo_mutex ); rc = ber_write( &tmpber, ld->ld_options.ldo_peer, - sizeof( struct sockaddr ), 0 ); + sizeof( struct sockaddr_storage ), 0 ); LDAP_MUTEX_UNLOCK( &ld->ld_options.ldo_mutex ); if ( rc == -1 ) { ld->ld_errno = LDAP_ENCODING_ERROR; diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c index f2a6c7b04c..d293299e2a 100644 --- a/libraries/libldap/result.c +++ b/libraries/libldap/result.c @@ -482,8 +482,8 @@ retry: sock_errset(0); #ifdef LDAP_CONNECTIONLESS if ( LDAP_IS_UDP(ld) ) { - struct sockaddr from; - ber_int_sb_read( lc->lconn_sb, &from, sizeof(struct sockaddr) ); + struct sockaddr_storage from; + ber_int_sb_read( lc->lconn_sb, &from, sizeof(struct sockaddr_storage) ); if ( ld->ld_options.ldo_version == LDAP_VERSION2 ) isv2 = 1; } nextresp3: diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c index 3867b5b20a..b966d1ae49 100644 --- a/libraries/libldap/search.c +++ b/libraries/libldap/search.c @@ -305,7 +305,7 @@ ldap_build_search_req( LDAP_NEXT_MSGID( ld, *idp ); #ifdef LDAP_CONNECTIONLESS if ( LDAP_IS_UDP(ld) ) { - struct sockaddr sa = {0}; + struct sockaddr_storage sa = {0}; /* dummy, filled with ldo_peer in request.c */ err = ber_write( ber, (char *) &sa, sizeof( sa ), 0 ); } -- 2.39.2