diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-08-30 00:18:45 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-08-30 00:22:19 -0400 |
commit | ee1377c3eef4238d89b2f99fa4d0bbbad3078b64 (patch) | |
tree | 629ac8232edb57ff2831b7801d1f426835adbfdd | |
parent | 57f5f544f58ffa1d6c38630d0522c9c0be67c533 (diff) |
[STRIP]: Fix neighbour table refcount leak.
Found by inspection. The STRIP driver does neigh_lookup() but never
releases. This driver shouldn't being doing gratuitous arp anyway.
Untested, obviously, because of lack of hardware.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/wireless/strip.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index fd31885c6844..ccaf28e8db0a 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c | |||
@@ -467,6 +467,7 @@ static int arp_query(unsigned char *haddr, u32 paddr, | |||
467 | struct net_device *dev) | 467 | struct net_device *dev) |
468 | { | 468 | { |
469 | struct neighbour *neighbor_entry; | 469 | struct neighbour *neighbor_entry; |
470 | int ret = 0; | ||
470 | 471 | ||
471 | neighbor_entry = neigh_lookup(&arp_tbl, &paddr, dev); | 472 | neighbor_entry = neigh_lookup(&arp_tbl, &paddr, dev); |
472 | 473 | ||
@@ -474,10 +475,11 @@ static int arp_query(unsigned char *haddr, u32 paddr, | |||
474 | neighbor_entry->used = jiffies; | 475 | neighbor_entry->used = jiffies; |
475 | if (neighbor_entry->nud_state & NUD_VALID) { | 476 | if (neighbor_entry->nud_state & NUD_VALID) { |
476 | memcpy(haddr, neighbor_entry->ha, dev->addr_len); | 477 | memcpy(haddr, neighbor_entry->ha, dev->addr_len); |
477 | return 1; | 478 | ret = 1; |
478 | } | 479 | } |
480 | neigh_release(neighbor_entry); | ||
479 | } | 481 | } |
480 | return 0; | 482 | return ret; |
481 | } | 483 | } |
482 | 484 | ||
483 | static void DumpData(char *msg, struct strip *strip_info, __u8 * ptr, | 485 | static void DumpData(char *msg, struct strip *strip_info, __u8 * ptr, |