sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "netdb: fix access within misaligned address error"

Browse Source 
This reverts commit 3f94828f6b.

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
This commit is contained in:
zhanghongyu 2022-04-07 13:52:32 +08:00 committed by archer
parent 4ea43f2df2
commit 4de0e626d0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/libc/netdb/lib_dnsquery.c
View File

@ -336,7 +336,6 @@ static int dns_recv_response(int sd, FAR union dns_addr_u *addr, int naddr,
FAR struct dns_answer_s *ans; FAR struct dns_answer_s *ans;
FAR struct dns_header_s *hdr; FAR struct dns_header_s *hdr;
FAR struct dns_question_s *que; FAR struct dns_question_s *que;
struct dns_question_s bak;
uint16_t nquestions; uint16_t nquestions;
uint16_t nanswers; uint16_t nanswers;
uint16_t temp; uint16_t temp;
@ -440,13 +439,12 @@ static int dns_recv_response(int sd, FAR union dns_addr_u *addr, int naddr,
/* Validate query type and class */ /* Validate query type and class */
que = (FAR struct dns_question_s *)nameptr; que = (FAR struct dns_question_s *)nameptr;
memcpy(&bak, que, sizeof(struct dns_question_s));
/* N.B. Unaligned access may occur here */ /* N.B. Unaligned access may occur here */
temp = HTONS(DNS_CLASS_IN); temp = HTONS(DNS_CLASS_IN);
if (memcmp(&bak.type, &qinfo->rectype, sizeof(uint16_t)) != 0 || if (memcmp(&que->type, &qinfo->rectype, sizeof(uint16_t)) != 0 ||
memcmp(&bak.class, &temp, sizeof(uint16_t)) != 0) memcmp(&que->class, &temp, sizeof(uint16_t)) != 0)
{ {
nerr("ERROR: DNS response with wrong question\n"); nerr("ERROR: DNS response with wrong question\n");
return -EBADMSG; return -EBADMSG;