diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-09 21:48:36 -0800 |
|---|---|---|
| committer | AK <andi@firstfloor.org> | 2011-03-31 11:58:15 -0700 |
| commit | 4bb1e0d018b987cbbac02b631242cbecdf4c6ae0 (patch) | |
| tree | ca4f2d9d6e869d64281d3ee3032238bd0a1091b1 /net | |
| parent | 0fa2aea484fd2fd9a713c77445a1bc49eafd3ad7 (diff) | |
x25: Do not reference freed memory.
commit 96642d42f076101ba98866363d908cab706d156c upstream.
In x25_link_free(), we destroy 'nb' before dereferencing
'nb->dev'. Don't do this, because 'nb' might be freed
by then.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Tested-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/x25/x25_link.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c index b25c6463c3e9..88048b6b0b2b 100644 --- a/net/x25/x25_link.c +++ b/net/x25/x25_link.c @@ -392,9 +392,12 @@ void __exit x25_link_free(void) write_lock_bh(&x25_neigh_list_lock); list_for_each_safe(entry, tmp, &x25_neigh_list) { + struct net_device *dev; + nb = list_entry(entry, struct x25_neigh, node); + dev = nb->dev; __x25_remove_neigh(nb); - dev_put(nb->dev); + dev_put(dev); } write_unlock_bh(&x25_neigh_list_lock); } |