Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: misaligned address exception in get_myaddress.c

Browse Source 
updates #2249 see #1401
This commit is contained in:
Jeffrey Hill
2015-02-23 12:06:21 -05:00
committed by Gedare Bloom
parent 237595d869
commit 344856b8ad
1 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
cpukit/librpc/src/rpc/get_myaddress.c
View File

@@ -45,13 +45,27 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/get_myaddress.c,v 1.17 2000/01/
#include <rpc/pmap_prot.h> #include <rpc/pmap_prot.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <sys/mbuf.h>
#include <net/if.h> #include <net/if.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
/*
* Determine the size of an ifreq structure when addresses larger
* than the pifreq structure size may be returned from the kernel.
*/
static size_t ifreqSize ( struct ifreq *pifreq )
{
size_t size = pifreq->ifr_addr.sa_len + sizeof(pifreq->ifr_name);
if ( size < sizeof ( *pifreq ) ) {
size = sizeof ( *pifreq );
}
return size;
}
/* /*
* don't use gethostbyname, which would invoke yellow pages * don't use gethostbyname, which would invoke yellow pages
* *
@@ -63,28 +77,32 @@ get_myaddress(
struct sockaddr_in *addr) struct sockaddr_in *addr)
{ {
int s; int s;
char buf[BUFSIZ];
struct ifconf ifc; struct ifconf ifc;
struct ifreq ifreq, *ifr, *end; struct ifreq ifreq, *ifr;
int loopback = 0, gotit = 0; int loopback = 0, gotit = 0;
if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
return(-1); return(-1);
} }
ifc.ifc_len = sizeof (buf); again:
ifc.ifc_buf = buf; ifc.ifc_len = sizeof ( struct ifreq ) * 8u;
ifc.ifc_buf = malloc ( ifc.ifc_len );
if ( ! ifc.ifc_buf ) {
_RPC_close(s);
return -1;
}
if (ioctl(s, SIOCGIFCONF, (char *)&ifc) < 0) { if (ioctl(s, SIOCGIFCONF, (char *)&ifc) < 0) {
_RPC_close(s); _RPC_close(s);
free ( ifc.ifc_buf );
return(-1); return(-1);
} }
again:
ifr = ifc.ifc_req; ifr = ifc.ifc_req;
end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
while (ifr < end) { while ( ifc.ifc_len >= ifreqSize ( ifr ) ) {
ifreq = *ifr; ifreq = *ifr;
if (ioctl(s, SIOCGIFFLAGS, (char *)&ifreq) < 0) { if (ioctl(s, SIOCGIFFLAGS, (char *) &ifreq ) < 0) {
_RPC_close(s); _RPC_close(s);
free ( ifc.ifc_buf );
return(-1); return(-1);
} }
if (((ifreq.ifr_flags & IFF_UP) && if (((ifreq.ifr_flags & IFF_UP) &&
@@ -98,16 +116,21 @@ again:
gotit = 1; gotit = 1;
break; break;
} }
if (ifr->ifr_addr.sa_len)
ifr = (struct ifreq *) ((caddr_t) ifr + const size_t len = ifreqSize ( ifr );
ifr->ifr_addr.sa_len - ifc.ifc_len -= len;
sizeof(struct sockaddr)); /*
ifr++; * RTEMS seems to require copy up to properly aligned
* boundary at the beginning of the buffer?
*/
memmove ( ifr, len + (char *) ifr, ifc.ifc_len );
} }
if (gotit == 0 && loopback == 0) { if (gotit == 0 && loopback == 0) {
free ( ifc.ifc_buf );
loopback = 1; loopback = 1;
goto again; goto again;
} }
(void)_RPC_close(s); (void)_RPC_close(s);
free ( ifc.ifc_buf );
return (gotit ? 0 : -1); return (gotit ? 0 : -1);
} }