emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dnsd: enforce alignment on packet buffer

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-04-14 10:14:25 -07:00
parent 8597da1934
commit 0ecc116592
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/platform.h
View File

@@ -281,10 +281,12 @@ typedef unsigned smalluint;
#if 1 /* if needed: !defined(arch1) && !defined(arch2) */ #if 1 /* if needed: !defined(arch1) && !defined(arch2) */
# define ALIGN1 __attribute__((aligned(1))) # define ALIGN1 __attribute__((aligned(1)))
# define ALIGN2 __attribute__((aligned(2))) # define ALIGN2 __attribute__((aligned(2)))
# define ALIGN4 __attribute__((aligned(4)))
#else #else
/* Arches which MUST have 2 or 4 byte alignment for everything are here */ /* Arches which MUST have 2 or 4 byte alignment for everything are here */
# define ALIGN1 # define ALIGN1
# define ALIGN2 # define ALIGN2
# define ALIGN4
#endif #endif

3
networking/dnsd.c
View File

@@ -480,7 +480,8 @@ int dnsd_main(int argc UNUSED_PARAM, char **argv)
unsigned lsa_size; unsigned lsa_size;
int udps, opts; int udps, opts;
uint16_t port = 53; uint16_t port = 53;
uint8_t buf[MAX_PACK_LEN + 1]; /* Ensure buf is 32bit aligned (we need 16bit, but 32bit can't hurt) */
uint8_t buf[MAX_PACK_LEN + 1] ALIGN4;
opts = getopt32(argv, "vsi:c:t:p:d", &listen_interface, &fileconf, &sttl, &sport); opts = getopt32(argv, "vsi:c:t:p:d", &listen_interface, &fileconf, &sttl, &sport);
//if (opts & (1 << 0)) // -v //if (opts & (1 << 0)) // -v