diff options
| author | Nick Briggs <nicholas.h.briggs@gmail.com> | 2024-02-01 10:11:17 -0800 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2024-03-13 23:09:00 +0300 |
| commit | edb47553b06db9cfe7501bcdcb28e6235ff71b20 (patch) | |
| tree | e816e25b2eef430c9ab8df50d51a6efc701021c8 | |
| parent | df052d6c1c13247de89b14d7e5193966afbd414e (diff) | |
Avoid unaligned fetch in ladr_match()
There is no guarantee that the PCNetState is allocated such that
csr[8] is allocated on an 8-byte boundary. Since not all hosts are
capable of unaligned fetches the 16-bit elements need to be fetched
individually to avoid a potential fault. Closes issue #2143
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2143
Signed-off-by: Nick Briggs <nicholas.h.briggs@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
(cherry picked from commit 6a5287ce80470bb8df95901d73ee779a64e70c3a)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | hw/net/pcnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index 56c3d14ad6..05ce8310ef 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -632,7 +632,7 @@ static inline int ladr_match(PCNetState *s, const uint8_t *buf, int size) { struct qemu_ether_header *hdr = (void *)buf; if ((*(hdr->ether_dhost)&0x01) && - ((uint64_t *)&s->csr[8])[0] != 0LL) { + (s->csr[8] | s->csr[9] | s->csr[10] | s->csr[11]) != 0) { uint8_t ladr[8] = { s->csr[8] & 0xff, s->csr[8] >> 8, s->csr[9] & 0xff, s->csr[9] >> 8, |