hw/net/allwinner-sun8i-emac.c: Fix REG_ADDR_HIGH/LOW reads
PATCH 1/1 hw/net/allwinner-sun8i-emac.c: Fix REG_ADDR_HIGH/LOW reads
Coverity points out (CID 1421926) that the read code for REG_ADDR_HIGH reads off the end of the buffer, because it does a 32-bit read from byte 4 of a 6-byte buffer.
The code also has an endianness issue for both REG_ADDR_HIGH and REG_ADDR_LOW, because it will do the wrong thing on a big-endian host.
Rewrite the read code to use ldl_le_p() and lduw_le_p() to fix this; the write code is not incorrect, but for consistency we make it use stl_le_p() and stw_le_p().
--- hw/net/allwinner-sun8i-emac.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
hw/net/allwinner-sun8i-emac.c +4 -8
@@ -611,10 +611,10 @@ static uint64_t allwinner_sun8i_emac_read(void *opaque, hwaddr offset, value = s->mii_data;break ;case REG_ADDR_HIGH :/* MAC Address High */ - value = *(((uint32_t *) (s->conf.macaddr.a)) +1 ); + value =lduw_le_p (s->conf.macaddr.a +4 );break ;case REG_ADDR_LOW :/* MAC Address Low */ - value = *(uint32_t *) (s->conf.macaddr.a); + value =ldl_le_p (s->conf.macaddr.a);break ;case REG_TX_DMA_STA :/* Transmit DMA Status */ break ;
@@ -728,14 +728,10 @@ static void allwinner_sun8i_emac_write(void *opaque, hwaddr offset, s->mii_data = value;break ;case REG_ADDR_HIGH :/* MAC Address High */ - s->conf.macaddr.a[4 ] = (value &0xff ); - s->conf.macaddr.a[5 ] = (value &0xff00 ) >>8 ; +stw_le_p (s->conf.macaddr.a +4 , value);break ;case REG_ADDR_LOW :/* MAC Address Low */ - s->conf.macaddr.a[0 ] = (value &0xff ); - s->conf.macaddr.a[1 ] = (value &0xff00 ) >>8 ; - s->conf.macaddr.a[2 ] = (value &0xff0000 ) >>16 ; - s->conf.macaddr.a[3 ] = (value &0xff000000 ) >>24 ; +stl_le_p (s->conf.macaddr.a, value);break ;case REG_TX_DMA_STA :/* Transmit DMA Status */ case REG_TX_CUR_DESC :/* Transmit Current Descriptor */
Signature · 1 line
2.20.1
Quoted 8 lines · Peter Maydell
Coverity points out (CID 1421926) that the read code for
REG_ADDR_HIGHreads off the end of the buffer, because it does a 32-bit read from byte 4 of a 6-byte buffer.The code also has an endianness issue for both
REG_ADDR_HIGHandREG_ADDR_LOW, because it will do the wrong thing on a big-endian host.
Quoted 8 lines
Rewrite the read code to use
ldl_le_p()andlduw_le_p()to fix this; the write code is not incorrect, but for consistency we make it usestl_le_p()andstw_le_p().Signed-off-by Peter Maydell <[email protected]>--- hw/net/allwinner-sun8i-emac.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
r~
Quoted 8 lines · Peter Maydell
Coverity points out (CID 1421926) that the read code for
REG_ADDR_HIGHreads off the end of the buffer, because it does a 32-bit read from byte 4 of a 6-byte buffer.The code also has an endianness issue for both
REG_ADDR_HIGHandREG_ADDR_LOW, because it will do the wrong thing on a big-endian host.
Quoted 6 lines
Rewrite the read code to use
ldl_le_p()andlduw_le_p()to fix this; the write code is not incorrect, but for consistency we make it usestl_le_p()andstw_le_p().Signed-off-by Peter Maydell <[email protected]>
By the way, is the coverity output of master publically available by any chance?
Regards,
Niek
Quoted 44 lines
--- hw/net/allwinner-sun8i-emac.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)hw/net/allwinner-sun8i-emac.c +2
-2@@ -611,10 +611,10 @@ static uint64_t allwinner_sun8i_emac_read(void *opaque, hwaddr offset, value = s->mii_data;break ;case REG_ADDR_HIGH :/* MAC Address High */ - value = *(((uint32_t *) (s->conf.macaddr.a)) +1 ); + value =lduw_le_p (s->conf.macaddr.a +4 );break ;case REG_ADDR_LOW :/* MAC Address Low */ - value = *(uint32_t *) (s->conf.macaddr.a); + value =ldl_le_p (s->conf.macaddr.a);break ;case REG_TX_DMA_STA :/* Transmit DMA Status */ break;hw/net/allwinner-sun8i-emac.c +2
-6@@ -728,14 +728,10 @@ static void allwinner_sun8i_emac_write(void *opaque,hwaddr offset, s->mii_data = value;break ;case REG_ADDR_HIGH :/* MAC Address High */ - s->conf.macaddr.a[4 ] = (value &0xff ); - s->conf.macaddr.a[5 ] = (value &0xff00 ) >>8 ; +stw_le_p (s->conf.macaddr.a +4 , value);break ;case REG_ADDR_LOW :/* MAC Address Low */ - s->conf.macaddr.a[0 ] = (value &0xff ); - s->conf.macaddr.a[1 ] = (value &0xff00 ) >>8 ; - s->conf.macaddr.a[2 ] = (value &0xff0000 ) >>16 ; - s->conf.macaddr.a[3 ] = (value &0xff000000 ) >>24 ; +stl_le_p (s->conf.macaddr.a, value);break ;case REG_TX_DMA_STA :/* Transmit DMA Status */ case
REG_TX_CUR_DESC: /* Transmit Current Descriptor */
--
2.20.1
Signature · 1 line
Niek Linnenbank
Quoted 1 line · Niek Linnenbank
By the way, is the coverity output of master publically available by any chance?
We use the public 'coverity scan' service:
https://scan.coverity.com/projects/qemu
You can create an account and look at the defects if you like, but we don't generally expect everybody to do that. Some of us tend to triage new issues as they come in and report the non-false-positives to the list.
thanks
-- PMM
Jason Wang
AppliedQuoted 41 lines · Peter Maydell
Coverity points out (CID 1421926) that the read code for
REG_ADDR_HIGHreads off the end of the buffer, because it does a 32-bit read from byte 4 of a 6-byte buffer.The code also has an endianness issue for both
REG_ADDR_HIGHandREG_ADDR_LOW, because it will do the wrong thing on a big-endian host.Rewrite the read code to use
ldl_le_p()andlduw_le_p()to fix this; the write code is not incorrect, but for consistency we make it usestl_le_p()andstw_le_p().Signed-off-by Peter Maydell <[email protected]>--- hw/net/allwinner-sun8i-emac.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)hw/net/allwinner-sun8i-emac.c +3
-4@@ -611,10 +611,10 @@ static uint64_t allwinner_sun8i_emac_read(void *opaque, hwaddr offset, value = s->mii_data;break ;case REG_ADDR_HIGH :/* MAC Address High */ - value = *(((uint32_t *) (s->conf.macaddr.a)) +1 ); + value =lduw_le_p (s->conf.macaddr.a +4 );break ;case REG_ADDR_LOW :/* MAC Address Low */ - value = *(uint32_t *) (s->conf.macaddr.a); + value =ldl_le_p (s->conf.macaddr.a);break ;case REG_TX_DMA_STA :/* Transmit DMA Status */ break ;@@ -728,14 +728,10 @@ static void allwinner_sun8i_emac_write(void *opaque, hwaddr offset, s->mii_data = value;break ;case REG_ADDR_HIGH :/* MAC Address High */ - s->conf.macaddr.a[4 ] = (value &0xff ); - s->conf.macaddr.a[5 ] = (value &0xff00 ) >>8 ; +stw_le_p (s->conf.macaddr.a +4 , value);
hw/net/allwinner-sun8i-emac.c static void allwinner_sun8i_emac_write(void *opaque, hwaddr offset, · line 737
Quoted 10 lines
hw/net/allwinner-sun8i-emac.c +1
-4break ;case REG_ADDR_LOW :/* MAC Address Low */ - s->conf.macaddr.a[0 ] = (value &0xff ); - s->conf.macaddr.a[1 ] = (value &0xff00 ) >>8 ; - s->conf.macaddr.a[2 ] = (value &0xff0000 ) >>16 ; - s->conf.macaddr.a[3 ] = (value &0xff000000 ) >>24 ; +stl_le_p (s->conf.macaddr.a, value);break ;case REG_TX_DMA_STA :/* Transmit DMA Status */ case REG_TX_CUR_DESC :/* Transmit Current Descriptor */
Applied.
Thanks