Skip to content

Commit

Permalink
IPoIB: In unicast_arp_send(), only free newly-created paths
Browse files Browse the repository at this point in the history
If path_rec_start() returns error, call path_free() only if the path
was newly-created.  If we free an existing path whose valid flag was zero,
(but do not detach it from the list) we cause corruption of the
path list (of which it is a member), and get a kernel crash.

The simplest solution is to not free an existing path -- just leave it
in the list as-is (i.e., with its valid flag cleared).

Thanks to Yossi Etigin of Voltaire for identifying the problem flow
which caused the kernel crash.

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Moni Shua <monis@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
  • Loading branch information
Jack Morgenstein authored and Roland Dreier committed Feb 17, 2009
1 parent f3b8436 commit 71d98b4
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/infiniband/ulp/ipoib/ipoib_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -660,16 +660,21 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,

path = __path_find(dev, phdr->hwaddr + 4);
if (!path || !path->valid) {
if (!path)
int new_path = 0;

if (!path) {
path = path_rec_create(dev, phdr->hwaddr + 4);
new_path = 1;
}
if (path) {
/* put pseudoheader back on for next time */
skb_push(skb, sizeof *phdr);
__skb_queue_tail(&path->queue, skb);

if (!path->query && path_rec_start(dev, path)) {
spin_unlock_irqrestore(&priv->lock, flags);
path_free(dev, path);
if (new_path)
path_free(dev, path);
return;
} else
__path_add(dev, path);
Expand Down

0 comments on commit 71d98b4

Please sign in to comment.