From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: samuel.thibault@ens-lyon.org, jan.kiszka@siemens.com
Subject: [Qemu-devel] [PATCH] slirp: Use lduw_be_p in slirp_input
Date: Wed, 26 Dec 2018 14:42:54 +1100 [thread overview]
Message-ID: <20181226034254.17842-1-richard.henderson@linaro.org> (raw)
The pointer may be unaligned, so we must use our routines for that.
At the same time, we might as well use the big-endian version
instead of ntohs.
This fixes sparc64 host SIGBUS during pxe boot.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
slirp/slirp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 322edf51eb..a116f43878 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -851,7 +851,7 @@ void slirp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
if (pkt_len < ETH_HLEN)
return;
- proto = ntohs(*(uint16_t *)(pkt + 12));
+ proto = lduw_be_p(pkt + 12);
switch(proto) {
case ETH_P_ARP:
arp_input(slirp, pkt, pkt_len);
--
2.17.2
next reply other threads:[~2018-12-26 3:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-26 3:42 Richard Henderson [this message]
2018-12-26 10:57 ` [Qemu-devel] [PATCH] slirp: Use lduw_be_p in slirp_input Peter Maydell
2018-12-26 11:04 ` Philippe Mathieu-Daudé
2019-01-16 23:50 ` Samuel Thibault
2019-01-17 0:05 ` Richard Henderson
2019-01-17 13:16 ` Philippe Mathieu-Daudé
2019-01-17 13:22 ` Samuel Thibault
2019-01-17 13:56 ` Peter Maydell
2019-01-18 11:25 ` Marc-André Lureau
2019-01-18 11:37 ` Marc-André Lureau
2019-01-18 11:54 ` Peter Maydell
2019-01-23 11:29 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181226034254.17842-1-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=jan.kiszka@siemens.com \
--cc=qemu-devel@nongnu.org \
--cc=samuel.thibault@ens-lyon.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).