Changeset 237595d8 in rtems

Timestamp:

02/23/15 15:46:22 (7 years ago)

Author:

Till Straumann <strauman@…>

Branches:

4.9

Children:

344856b8

Parents:

e446d32

git-author:

Till Straumann <strauman@…> (02/23/15 15:46:22)

git-committer:

Gedare Bloom <gedare@…> (02/23/15 15:46:22)

Message:

networking: alignment exception in ioctl(SIOCGIFCONF)

Access memory using a byte stream when copying to avoid unaligned
access. close #1401 update #2249

File:

• cpukit/libnetworking/net/if.c (modified) (3 diffs)

cpukit/libnetworking/net/if.c

@@ -716 +716 @@
         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];
@@ -732 +733 @@
                 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) {
@@ -746 +747 @@
                                 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)