drivers/infiniband/ulp/ipoib/ipoib_main.c: use-after-free
The Coverity checker spotted the following code introduced by commit 839fcaba355abaffb7b44f0f4504093acb0b11cf:
<-- snip -->
...
static void path_rec_completion(int status,
struct ib_sa_path_rec *pathrec, void *path_ptr)
{
...
list_for_each_entry(neigh, &path->neigh_list, list) {
kref_get(&path->ah->ref);
neigh->ah = path->ah;
memcpy(&neigh->dgid.raw, &path->pathrec.dgid.raw,
sizeof(union ib_gid));
if (ipoib_cm_enabled(dev, neigh->neighbour)) {
if (!ipoib_cm_get(neigh))
ipoib_cm_set(neigh, ipoib_cm_create_tx(dev,
path,
neigh));
if (!ipoib_cm_get(neigh)) {
list_del(&neigh->list);
if (neigh->ah)
ipoib_put_ah(neigh->ah);
ipoib_neigh_free(dev, neigh);
continue;
}
}
while ((skb = __skb_dequeue(&neigh->queue)))
__skb_queue_tail(&skqueue, skb);
}...
<-- snip -->
Notice that before the continue "neigh" gets freed, but the list_for_each_entry() for() loop uses it.
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedQuoted 37 lines
Quoting Adrian Bunk <[email protected]>:
Subject: [ofa-general]drivers/infiniband/ulp/ipoib/ipoib_main.c: use-after-freeThe Coverity checker spotted the following code introduced by commit
839fcaba355abaffb7b44f0f4504093acb0b11cf:<-- snip -->
...
static void path_rec_completion(int status,
structib_sa_path_rec*pathrec, void*path_ptr)
{
...list_for_each_entry(neigh, &path->neigh_list, list) { kref_get(&path->ah->ref); neigh->ah = path->ah; memcpy(&neigh->dgid.raw, &path->pathrec.dgid.raw, sizeof(union ib_gid)); if (ipoib_cm_enabled(dev, neigh->neighbour)) { if (!ipoib_cm_get(neigh)) ipoib_cm_set(neigh, ipoib_cm_create_tx(dev, path, neigh)); if (!ipoib_cm_get(neigh)) { list_del(&neigh->list); if (neigh->ah) ipoib_put_ah(neigh->ah); ipoib_neigh_free(dev, neigh); continue; } } while ((skb = __skb_dequeue(&neigh->queue))) __skb_queue_tail(&skqueue, skb); }
Quoted 6 lines
...
<-- snip -->
Notice that before the continue "neigh" gets freed, but the
list_for_each_entry()for()loop uses it.
Something like this then? Untested.
drivers/infiniband/ulp/ipoib/ipoib_main.c +2 -2
@@ -380,7 +380,7 @@ static void path_rec_completion(int status,struct net_device *dev = path->dev;struct ipoib_dev_priv *priv =netdev_priv (dev);struct ipoib_ah *ah =NULL ; -struct ipoib_neigh *neigh; +struct ipoib_neigh *neigh, *t;struct sk_buff_head skqueue;struct sk_buff *skb;unsigned long flags;
@@ -418,7 +418,7 @@ static void path_rec_completion(int status,while ((skb =__skb_dequeue (&path->queue)))__skb_queue_tail (&skqueue, skb); -list_for_each_entry (neigh, &path->neigh_list, list) { +list_for_each_entry_safe (neigh, t, &path->neigh_list, list) {kref_get (&path->ah->ref); neigh->ah = path->ah; memcpy(&neigh->dgid.raw, &path->pathrec.dgid.raw,
Signature · 1 line
MST
Quoted 1 line
Something like this then? Untested.
Looks right to me, and seems to work. So I'll apply this.
- R.