* [PATCH] net/e1000: fix memcpy in e1000_get_strings
@ 2007-11-29 1:54 Roel Kluin
2007-11-29 16:28 ` Kok, Auke
2007-12-05 19:23 ` Kok, Auke
0 siblings, 2 replies; 3+ messages in thread
From: Roel Kluin @ 2007-11-29 1:54 UTC (permalink / raw)
To: Kok, Auke, lkml; +Cc: e1000-devel
drivers/net/e1000/e1000_ethtool.c:113:
#define E1000_TEST_LEN sizeof(e1000_gstrings_test) / ETH_GSTRING_LEN
drivers/net/e1000e/ethtool.c:106:
#define E1000_TEST_LEN sizeof(e1000_gstrings_test) / ETH_GSTRING_LEN
E1000_TEST_LEN*ETH_GSTRING_LEN will expand to
sizeof(e1000_gstrings_test) / (ETH_GSTRING_LEN * ETH_GSTRING_LEN)
Please confirm that the change is as wanted.
--
A lack of parentheses around defines causes unexpected results due to operator
precedences.
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
---
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 667f18b..b83ccce 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1923,7 +1923,7 @@ e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
switch (stringset) {
case ETH_SS_TEST:
memcpy(data, *e1000_gstrings_test,
- E1000_TEST_LEN*ETH_GSTRING_LEN);
+ sizeof(e1000_gstrings_test));
break;
case ETH_SS_STATS:
for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 6a39784..338c49d 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1739,7 +1739,7 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
switch (stringset) {
case ETH_SS_TEST:
memcpy(data, *e1000_gstrings_test,
- E1000_TEST_LEN*ETH_GSTRING_LEN);
+ sizeof(e1000_gstrings_test));
break;
case ETH_SS_STATS:
for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net/e1000: fix memcpy in e1000_get_strings
2007-11-29 1:54 [PATCH] net/e1000: fix memcpy in e1000_get_strings Roel Kluin
@ 2007-11-29 16:28 ` Kok, Auke
2007-12-05 19:23 ` Kok, Auke
1 sibling, 0 replies; 3+ messages in thread
From: Kok, Auke @ 2007-11-29 16:28 UTC (permalink / raw)
To: Roel Kluin; +Cc: Kok, Auke, lkml, e1000-devel
Roel Kluin wrote:
> drivers/net/e1000/e1000_ethtool.c:113:
> #define E1000_TEST_LEN sizeof(e1000_gstrings_test) / ETH_GSTRING_LEN
>
> drivers/net/e1000e/ethtool.c:106:
> #define E1000_TEST_LEN sizeof(e1000_gstrings_test) / ETH_GSTRING_LEN
>
> E1000_TEST_LEN*ETH_GSTRING_LEN will expand to
> sizeof(e1000_gstrings_test) / (ETH_GSTRING_LEN * ETH_GSTRING_LEN)
>
> Please confirm that the change is as wanted.
Thanks,
I'll take a look at this closely and post these to netdev-2.6.
thanks
Auke
> --
> A lack of parentheses around defines causes unexpected results due to operator
> precedences.
>
> Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
> ---
> diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
> index 667f18b..b83ccce 100644
> --- a/drivers/net/e1000/e1000_ethtool.c
> +++ b/drivers/net/e1000/e1000_ethtool.c
> @@ -1923,7 +1923,7 @@ e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
> switch (stringset) {
> case ETH_SS_TEST:
> memcpy(data, *e1000_gstrings_test,
> - E1000_TEST_LEN*ETH_GSTRING_LEN);
> + sizeof(e1000_gstrings_test));
> break;
> case ETH_SS_STATS:
> for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
> diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
> index 6a39784..338c49d 100644
> --- a/drivers/net/e1000e/ethtool.c
> +++ b/drivers/net/e1000e/ethtool.c
> @@ -1739,7 +1739,7 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
> switch (stringset) {
> case ETH_SS_TEST:
> memcpy(data, *e1000_gstrings_test,
> - E1000_TEST_LEN*ETH_GSTRING_LEN);
> + sizeof(e1000_gstrings_test));
> break;
> case ETH_SS_STATS:
> for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net/e1000: fix memcpy in e1000_get_strings
2007-11-29 1:54 [PATCH] net/e1000: fix memcpy in e1000_get_strings Roel Kluin
2007-11-29 16:28 ` Kok, Auke
@ 2007-12-05 19:23 ` Kok, Auke
1 sibling, 0 replies; 3+ messages in thread
From: Kok, Auke @ 2007-12-05 19:23 UTC (permalink / raw)
To: Roel Kluin; +Cc: lkml, e1000-devel
Roel Kluin wrote:
> drivers/net/e1000/e1000_ethtool.c:113:
> #define E1000_TEST_LEN sizeof(e1000_gstrings_test) / ETH_GSTRING_LEN
>
> drivers/net/e1000e/ethtool.c:106:
> #define E1000_TEST_LEN sizeof(e1000_gstrings_test) / ETH_GSTRING_LEN
>
> E1000_TEST_LEN*ETH_GSTRING_LEN will expand to
> sizeof(e1000_gstrings_test) / (ETH_GSTRING_LEN * ETH_GSTRING_LEN)
>
> Please confirm that the change is as wanted.
> --
> A lack of parentheses around defines causes unexpected results due to operator
> precedences.
>
> Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
> ---
> diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
> index 667f18b..b83ccce 100644
> --- a/drivers/net/e1000/e1000_ethtool.c
> +++ b/drivers/net/e1000/e1000_ethtool.c
> @@ -1923,7 +1923,7 @@ e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
> switch (stringset) {
> case ETH_SS_TEST:
> memcpy(data, *e1000_gstrings_test,
> - E1000_TEST_LEN*ETH_GSTRING_LEN);
> + sizeof(e1000_gstrings_test));
> break;
> case ETH_SS_STATS:
> for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
> diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
> index 6a39784..338c49d 100644
> --- a/drivers/net/e1000e/ethtool.c
> +++ b/drivers/net/e1000e/ethtool.c
> @@ -1739,7 +1739,7 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
> switch (stringset) {
> case ETH_SS_TEST:
> memcpy(data, *e1000_gstrings_test,
> - E1000_TEST_LEN*ETH_GSTRING_LEN);
> + sizeof(e1000_gstrings_test));
> break;
> case ETH_SS_STATS:
> for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
actually this was recently fixed (with a cleanup to use ARRAY_SIZE!), but I really
like the sizeof() safety in the memcpy anyway, so I'll push this patch anyway.
thanks,
Auke
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-12-05 19:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-29 1:54 [PATCH] net/e1000: fix memcpy in e1000_get_strings Roel Kluin
2007-11-29 16:28 ` Kok, Auke
2007-12-05 19:23 ` Kok, Auke
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).