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

networking: alignment exception in ioctl(SIOCGIFCONF)

Browse Source 
Access memory using a byte stream when copying to avoid unaligned
access. close #1401 update #2249
This commit is contained in:
Till Straumann
2015-02-23 10:46:22 -05:00
committed by Gedare Bloom
parent e446d32687
commit 237595d869
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cpukit/libnetworking/net/if.c
View File

@@ -715,9 +715,10 @@ ifconf(u_long cmd, caddr_t data)
struct ifnet *ifp = ifnet;
struct ifaddr *ifa;
struct ifreq ifr, *ifrp;
char *ifrpc;
int space = ifc->ifc_len, error = 0;
ifrp = ifc->ifc_req;
ifrpc = (char*)ifc->ifc_req;
for (; space > sizeof (ifr) && ifp; ifp = ifp->if_next) {
char workbuf[64];
int ifnlen;
@@ -731,11 +732,11 @@ ifconf(u_long cmd, caddr_t data)
if ((ifa = ifp->if_addrlist) == 0) {
bzero((caddr_t)&ifr.ifr_addr, sizeof(ifr.ifr_addr));
error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
error = copyout((caddr_t)&ifr, (caddr_t)ifrpc,
sizeof (ifr));
if (error)
break;
space -= sizeof (ifr), ifrp++;
space -= sizeof (ifr); ifrpc+=sizeof(ifr);
} else
for ( ; space > sizeof (ifr) && ifa; ifa = ifa->ifa_next) {
struct sockaddr *sa = ifa->ifa_addr;
@@ -745,27 +746,27 @@ ifconf(u_long cmd, caddr_t data)
(struct osockaddr *)&ifr.ifr_addr;
ifr.ifr_addr = *sa;
osa->sa_family = sa->sa_family;
error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
error = copyout((caddr_t)&ifr, (caddr_t)ifrpc,
sizeof (ifr));
ifrp++;
ifrpc+=sizeof(ifr);
} else
#endif
if (sa->sa_len <= sizeof(*sa)) {
ifr.ifr_addr = *sa;
error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
error = copyout((caddr_t)&ifr, (caddr_t)ifrpc,
sizeof (ifr));
ifrp++;
ifrpc+=sizeof(ifr);
} else {
space -= sa->sa_len - sizeof(*sa);
if (space < sizeof (ifr))
break;
error = copyout((caddr_t)&ifr, (caddr_t)ifrp,
error = copyout((caddr_t)&ifr, (caddr_t)ifrpc,
sizeof (ifr.ifr_name));
ifrpc+=sizeof(ifr.ifr_name);
if (error == 0)
error = copyout((caddr_t)sa,
(caddr_t)&ifrp->ifr_addr, sa->sa_len);
ifrp = (struct ifreq *)
(sa->sa_len + (caddr_t)&ifrp->ifr_addr);
(caddr_t)ifrpc, sa->sa_len);
ifrpc += sa->sa_len;
}
if (error)
break;