Skip to contentSkip to conversation

e1000e: Use sizeof struct rather than pointer in e1000_get_eeprom()

PATCH In review Roel Kluin 2 participants 3 messages Nov 21, 2009 – Nov 23, 2009 Network drivers

lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

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
index 1bf4d2a..13c658e 100644
@@ -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++)
author
#1 lore raw

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
index 1bf4d2a..5b276c0 100644
@@ -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++)
#2 lore raw
Quoted 22 lines · Roel Kluin

Don't use the sizeof the pointer to clear the result

---
 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_buff was kmalloc'd with:

eeprom_buff = kmalloc(sizeof(u16) *
                       (last_word - first_word + 1), GFP_KERNEL);

How about:

drivers/net/e1000e/ethtool.c +0 -0
index 1bf4d2a..5b276c0 100644

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