Merge tag 'hw-misc-20260223' of https://github.com/philmd/qemu into staging
Misc HW & Net patches - Fix trace event name in m68k system controller - Constify and rename virtio_is_big_endian() - Fix heap buffer overflow in virtio-serial-bus - Set graphic display dimensions generically (removing system/globals-target.c) - Mark eth_header, udp_header, tcp_header as packed structures - Minor doc / header cleanups # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmmbj2wACgkQ4+MsLN6t # wN7LqBAAq30ShByylpAJ7DvekgGOHCXeHSdVPZKB8eDC5aVULQfPKp8Ij0v7WpwD # RzZZWL35nSAqLiMLxxpP/VSY1T+PopoaHtKuZfVc5J/J/mr6lvpbsMlo6jRe/lvT # r2m5MYGyUnAPsm/t44nG7E53xIqvT5eFMMjMQSYQXgi1RztNGepE5acrOHk2RrWc # X0NqORf6SeAvo6FX8lIQTQq9/4ePH9f3+DXiM48OaKNVDshARd8C7l3Q2aAC0UWi # sP0oL7Re0mmCJ4820/tTqsKs9D+4U3Hu5lW0FPdXU6uLoNr70T2g29pRLE4o5mP5 # UV91+x6FdUm7o0oDJ6fxqa0Acdc14QObNeNKkFPIJetvWCOyLdk6tJA6sb6XfPnd # t2JNvBDJonoUrSSaSp6ZiPP3pOzHyoa/NJUJ7HbRrTPzGHPf3ffwKtG53NkSqP4i # Py1kFVJW3Ykyq1SUlQ/7UD/N5SPg1RLv8lTqdYXuY6cig7D1XDOPapUtvhKjb+H0 # GIouskPOF/nfB8vBiPDnM+LAC3RwFUi03U3IEEUfRPPvjSflwsNho7j6g+tU7IXk # DfCwgfyMxvbTJAcalH0EufIDEsCrQ3HvH0oMnidP5Jz4VXCEocb/0zOrBTxbScKH # Gk4UDN2eqqsbecnAeF7kOE9VOfSSZDrA7ZdvWGD6ofPL0b9wytk= # =VJig # -----END PGP SIGNATURE----- # gpg: Signature made Sun Feb 22 23:21:16 2026 GMT # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full] # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * tag 'hw-misc-20260223' of https://github.com/philmd/qemu: (21 commits) net: mark struct tcp_header as QEMU_PACKED net: mark struct udp_header as QEMU_PACKED net: mark struct eth_header as QEMU_PACKED hw/net/rocker: Don't assume h_proto is aligned in eth_strip_vlan_ex() hw/net/rocker: Don't keep pointer to h_proto as uint16_t* in OfDpaFlowPktFields hw/net/rtl8139: Remove ineffective parameter hw/core/cpu: expand cpu_reset function docs hw/alpha: remove unused includes hw/ppc/spapr: extract SPAPR_MAX_RAM_SLOTS in a new header system/globals: Build as common code hw/ppc: Set graphic display dimensions generically hw/sparc: Set graphic display dimensions generically hw/m68k: Set graphic display dimensions generically hw/m68k/q800: Set MACFB_DISPLAY_APPLE_21_COLOR within MacFrameBuffer hw/m68k/q800: Use MacFbMode fields in q800_machine_init() hw/display/macfb: Constify macfb_mode_table[] array hw/display/macfb: Constify macfb_sense_table[] array hw/char/virtio-serial-bus: Fix Heap-buffer-overflow in set_config() hw/virtio: rename virtio_is_big_endian to virtio_vdev_is_big_endian hw/virtio: Constify virtio_is_big_endian() argument ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
@@ -274,7 +274,7 @@ eth_strip_vlan_ex(const struct iovec *iov, int iovcnt, size_t iovoff, int index,
|
||||
uint16_t *payload_offset, uint16_t *tci)
|
||||
{
|
||||
struct vlan_header vlan_hdr;
|
||||
uint16_t *new_ehdr_proto;
|
||||
void *new_ehdr_proto;
|
||||
size_t new_ehdr_size;
|
||||
size_t copied;
|
||||
|
||||
@@ -298,7 +298,7 @@ eth_strip_vlan_ex(const struct iovec *iov, int iovcnt, size_t iovoff, int index,
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (copied < new_ehdr_size || be16_to_cpu(*new_ehdr_proto) != vet) {
|
||||
if (copied < new_ehdr_size || lduw_be_p(new_ehdr_proto) != vet) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -308,7 +308,7 @@ eth_strip_vlan_ex(const struct iovec *iov, int iovcnt, size_t iovoff, int index,
|
||||
return 0;
|
||||
}
|
||||
|
||||
*new_ehdr_proto = vlan_hdr.h_proto;
|
||||
stw_he_p(new_ehdr_proto, vlan_hdr.h_proto);
|
||||
*payload_offset = iovoff + new_ehdr_size + sizeof(vlan_hdr);
|
||||
*tci = be16_to_cpu(vlan_hdr.h_tci);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user