summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-11-26 14:26:31 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-11-26 14:26:31 (GMT)
commit57be1eefab8494efd96bcec0f54a84cef3f61e95 (patch)
treef8bf39c2184693726dd06bc4a084054f02d1e761
parent1e1136025b2e6316f2cfaca76699a2d9de900aef (diff)
downloadbusybox-57be1eefab8494efd96bcec0f54a84cef3f61e95.tar.gz
busybox-57be1eefab8494efd96bcec0f54a84cef3f61e95.tar.bz2
ping: fix unaligned access. closes bug 745.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--include/platform.h2
-rw-r--r--networking/ping.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/include/platform.h b/include/platform.h
index 8ed05a4..a41daa0 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -194,12 +194,14 @@
* a lvalue. This makes it more likely to not swap them by mistake
*/
#if defined(i386) || defined(__x86_64__)
+# define move_from_unaligned_int(v, intp) ((v) = *(int*)(intp))
# define move_from_unaligned16(v, u16p) ((v) = *(uint16_t*)(u16p))
# define move_from_unaligned32(v, u32p) ((v) = *(uint32_t*)(u32p))
# define move_to_unaligned32(u32p, v) (*(uint32_t*)(u32p) = (v))
/* #elif ... - add your favorite arch today! */
#else
/* performs reasonably well (gcc usually inlines memcpy here) */
+# define move_from_unaligned_int(v, intp) (memcpy(&(v), (intp), sizeof(int)))
# define move_from_unaligned16(v, u16p) (memcpy(&(v), (u16p), 2))
# define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
# define move_to_unaligned32(u32p, v) do { \
diff --git a/networking/ping.c b/networking/ping.c
index c7b6cbe..4e770bd 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -690,7 +690,8 @@ static void ping6(len_and_sockaddr *lsa)
/* don't check len - we trust the kernel: */
/* && mp->cmsg_len >= CMSG_LEN(sizeof(int)) */
) {
- hoplimit = *(int*)CMSG_DATA(mp);
+ /*hoplimit = *(int*)CMSG_DATA(mp); - unaligned access */
+ move_from_unaligned_int(hoplimit, CMSG_DATA(mp));
}
}
unpack6(packet, c, /*&from,*/ hoplimit);