david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/net/e1000: fix integer endianness

Browse Source 
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: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Message-id: 1426224119-8352-1-git-send-email-zhaoshenglong@huawei.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Shannon Zhao 2015-03-13 13:21:59 +08:00 committed by Stefan Hajnoczi
parent 4ad9e2b36e
commit 4e60a250d3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/net/e1000.c
View File

@ -578,7 +578,7 @@ static inline int
is_vlan_packet(E1000State *s, const uint8_t *buf) is_vlan_packet(E1000State *s, const uint8_t *buf)
{ {
return (be16_to_cpup((uint16_t *)(buf + 12)) == 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 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->cptse || txd_lower & E1000_TXD_CMD_EOP)) {
tp->vlan_needed = 1; tp->vlan_needed = 1;
stw_be_p(tp->vlan_header, 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, stw_be_p(tp->vlan_header + 2,
le16_to_cpu(dp->upper.fields.special)); le16_to_cpu(dp->upper.fields.special));
} }