e1000e: Use sizeof struct rather than pointer in e1000_get_eeprom()
PATCH 1/1 e1000e: Use sizeof struct rather than pointer in e1000_get_eeprom()
The sizeof the struct should be used rather than of the pointer
--- drivers/net/e1000e/ethtool.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Unless I am mistaken?
drivers/net/e1000e/ethtool.c +1 -1
@@ -508,7 +508,7 @@ static int e1000_get_eeprom(struct net_device *netdev,if (ret_val) {/* a read error occurred, throw away the result */ -memset (eeprom_buff,0xff ,sizeof (eeprom_buff)); +memset (eeprom_buff,0xff ,sizeof (*eeprom_buff)); }else {/* Device's eeprom is always little-endian, word addressable */ for (i =0 ; i < last_word - first_word +1 ; i++)
Don't use the sizeof the pointer to clear the result
--- drivers/net/e1000e/ethtool.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
Review
Quoted 2 lines
(quoted diff) +1
-1- memset(eeprom_buff, 0xff, sizeof(eeprom_buff)); + memset(eeprom_buff, 0xff, sizeof(*eeprom_buff));
No it's probably still not correct, eeprom_buff was kmalloc'd with:
eeprom_buff = kmalloc(sizeof(u16) *
(last_word - first_word + 1), GFP_KERNEL);
How about:
drivers/net/e1000e/ethtool.c +2 -1
@@ -508,7 +508,8 @@ static int e1000_get_eeprom(struct net_device *netdev,if (ret_val) {/* a read error occurred, throw away the result */ -memset (eeprom_buff,0xff ,sizeof (eeprom_buff)); +memset (eeprom_buff,0xff ,sizeof (u16) * + (last_word - first_word +1 )); }else {/* Device's eeprom is always little-endian, word addressable */ for (i =0 ; i < last_word - first_word +1 ; i++)
Quoted 22 lines · Roel Kluin
Don't use the sizeof the pointer to clear the result
Signed-off-by Roel Kluin <[email protected]>---
drivers/net/e1000e/ethtool.c | 3 ++-1 files changed, 2 insertions(+), 1 deletions(-)Quoted 2 lines
-
memset(eeprom_buff, 0xff, sizeof(eeprom_buff));
+memset(eeprom_buff, 0xff, sizeof(*eeprom_buff));No it's probably still not correct,
eeprom_buffwas kmalloc'd with:
eeprom_buff= kmalloc(sizeof(u16) *
(last_word -first_word+ 1),GFP_KERNEL);How about:
drivers/net/e1000e/ethtool.c +0
-0
drivers/net/e1000e/ethtool.c static int e1000_get_eeprom(struct net_device *netdev,
Quoted 10 lines
drivers/net/e1000e/ethtool.c +2
-2@@ -508,7 +508,8 @@ static int e1000_get_eeprom(struct net_device *netdev, if (ret_val) { /* a read error occurred, throw away the result */ - memset(eeprom_buff, 0xff, sizeof(eeprom_buff)); + memset(eeprom_buff, 0xff, sizeof(u16) * + (last_word - first_word + 1)); } else { /* Device's eeprom is always little-endian, word addressable */ for (i = 0; i < last_word - first_word + 1; i++) --
Thanks Roel. I will add this to my tree for testing and review.
Signature · 2 lines
Cheers, Jeff