diff options
author | David S. Miller <davem@davemloft.net> | 2011-11-26 15:41:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-26 15:41:29 -0500 |
commit | b4c0e72e80e2e04b462ea05cc5a001807d7feed6 (patch) | |
tree | e0533e1e18ab68729063f7419ed056820dea443f /drivers/net | |
parent | f47398409c140a48dd40faf75a18f7c93504a22e (diff) |
ray_cs: Fix array bounds warnings.
rx_msg is defined to have a 1 entry array at the end, so gcc warns:
drivers/net/wireless/ray_cs.c: In function ‘rx_authenticate’:
drivers/net/wireless/ray_cs.c:2436:3: warning: array subscript is above array bounds [-Warray-bounds]
drivers/net/wireless/ray_cs.c:2436:3: warning: array subscript is above array bounds [-Warray-bounds]
drivers/net/wireless/ray_cs.c:2436:3: warning: array subscript is above array bounds [-Warray-bounds]
drivers/net/wireless/ray_cs.c:2436:3: warning: array subscript is above array bounds [-Warray-bounds]
drivers/net/wireless/ray_cs.c:2436:3: warning: array subscript is above array bounds [-Warray-bounds]
drivers/net/wireless/ray_cs.c:2439:15: warning: array subscript is above array bounds [-Warray-bounds]
drivers/net/wireless/ray_cs.c:2452:16: warning: array subscript is above array bounds [-Warray-bounds]
drivers/net/wireless/ray_cs.c:2453:18: warning: array subscript is above array bounds [-Warray-bounds]
drivers/net/wireless/ray_cs.c:2453:32: warning: array subscript is above array bounds [-Warray-bounds]
Use a zero length array and rename to "ray_rx_msg" to make sure we hit all
of the necessary cases.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rayctl.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 0021e4948512..04fec1fa6e0b 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -2426,7 +2426,7 @@ static void rx_authenticate(ray_dev_t *local, struct rcs __iomem *prcs, | |||
2426 | unsigned int pkt_addr, int rx_len) | 2426 | unsigned int pkt_addr, int rx_len) |
2427 | { | 2427 | { |
2428 | UCHAR buff[256]; | 2428 | UCHAR buff[256]; |
2429 | struct rx_msg *msg = (struct rx_msg *)buff; | 2429 | struct ray_rx_msg *msg = (struct ray_rx_msg *) buff; |
2430 | 2430 | ||
2431 | del_timer(&local->timer); | 2431 | del_timer(&local->timer); |
2432 | 2432 | ||
@@ -2513,7 +2513,7 @@ static void rx_deauthenticate(ray_dev_t *local, struct rcs __iomem *prcs, | |||
2513 | unsigned int pkt_addr, int rx_len) | 2513 | unsigned int pkt_addr, int rx_len) |
2514 | { | 2514 | { |
2515 | /* UCHAR buff[256]; | 2515 | /* UCHAR buff[256]; |
2516 | struct rx_msg *msg = (struct rx_msg *)buff; | 2516 | struct ray_rx_msg *msg = (struct ray_rx_msg *) buff; |
2517 | */ | 2517 | */ |
2518 | pr_debug("Deauthentication frame received\n"); | 2518 | pr_debug("Deauthentication frame received\n"); |
2519 | local->authentication_state = UNAUTHENTICATED; | 2519 | local->authentication_state = UNAUTHENTICATED; |
diff --git a/drivers/net/wireless/rayctl.h b/drivers/net/wireless/rayctl.h index d7646f299bd3..3c3b98b152c3 100644 --- a/drivers/net/wireless/rayctl.h +++ b/drivers/net/wireless/rayctl.h | |||
@@ -566,9 +566,9 @@ struct phy_header { | |||
566 | UCHAR hdr_3; | 566 | UCHAR hdr_3; |
567 | UCHAR hdr_4; | 567 | UCHAR hdr_4; |
568 | }; | 568 | }; |
569 | struct rx_msg { | 569 | struct ray_rx_msg { |
570 | struct mac_header mac; | 570 | struct mac_header mac; |
571 | UCHAR var[1]; | 571 | UCHAR var[0]; |
572 | }; | 572 | }; |
573 | 573 | ||
574 | struct tx_msg { | 574 | struct tx_msg { |