Commit 34ef723c authored by Peter Maydell's avatar Peter Maydell Committed by Greg Kurz
Browse files

tests/virtio-9p-test: Don't call le*_to_cpus on fields of packed struct



For a packed struct like 'P9Hdr' the fields within it may not be
aligned as much as the natural alignment for their types.  This means
it is not valid to pass the address of such a field to a function
like le32_to_cpus() which operate on uint32_t* and assume alignment.
Doing this results in a SIGBUS on hosts like SPARC which have strict
alignment requirements.

Use ldl_le_p() instead, which is specified to correctly handle
unaligned pointers.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
parent d63fb193
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -256,8 +256,8 @@ static void v9fs_req_recv(P9Req *req, uint8_t id)
        qvirtio_wait_queue_isr(v9p->dev, v9p->vq, 1000 * 1000);

        v9fs_memread(req, &hdr, 7);
        le32_to_cpus(&hdr.size);
        le16_to_cpus(&hdr.tag);
        hdr.size = ldl_le_p(&hdr.size);
        hdr.tag = lduw_le_p(&hdr.tag);
        if (hdr.size >= 7) {
            break;
        }