Commit 4e60a250 authored by Shannon Zhao's avatar Shannon Zhao Committed by Stefan Hajnoczi
Browse files

hw/net/e1000: fix integer endianness 



It's detected by coverity.In is_vlan_packet s->mac_reg[VET] is
unsigned int but is dereferenced as a narrower unsigned short.
This may lead to unexpected results depending on machine
endianness.

Signed-off-by: default avatarShannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Message-id: 1426224119-8352-1-git-send-email-zhaoshenglong@huawei.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 4ad9e2b3

hw/net/e1000.c

+2 −2
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ static inline int 
is_vlan_packet(E1000State *s, const uint8_t *buf)

{

    return (be16_to_cpup((uint16_t *)(buf + 12)) ==

                le16_to_cpup((uint16_t *)(s->mac_reg + VET)));

                le16_to_cpu(s->mac_reg[VET]));

}



static inline int
@@ -711,7 +711,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) 
        (tp->cptse || txd_lower & E1000_TXD_CMD_EOP)) {

        tp->vlan_needed = 1;

        stw_be_p(tp->vlan_header,

                      le16_to_cpup((uint16_t *)(s->mac_reg + VET)));

                      le16_to_cpu(s->mac_reg[VET]));

        stw_be_p(tp->vlan_header + 2,

                      le16_to_cpu(dp->upper.fields.special));

    }