Skip to content

Commit 50be28d

Browse files
Erez Shitritdledford
authored andcommitted
IB/IPoIB: Fix kernel panic on multicast flow
ipoib_mcast_restart_task calls ipoib_mcast_remove_list with the parameter mcast->dev. That mcast is a temporary (used as an iterator) variable that may be uninitialized. There is no need to send the variable dev to the function, as each mcast has its dev as a member in the mcast struct. This causes the next panic: RIP: 0010: ipoib_mcast_leave+0x6d/0xf0 [ib_ipoib] RSP: 0018: EFLAGS: 00010246 RAX: f0201 RBX: 24e00 RCX: 00000 .... .... Stack: Call Trace: ipoib_mcast_remove_list+0x3a/0x70 [ib_ipoib] ipoib_mcast_restart_task+0x3bb/0x520 [ib_ipoib] process_one_work+0x164/0x470 worker_thread+0x11d/0x420 ... Fixes: 5a0e81f ('IB/IPoIB: factor out common multicast list removal code') Signed-off-by: Erez Shitrit <[email protected]> Reported-by: Doron Tsur <[email protected]> Reviewed-by: Christoph Lameter <[email protected]> Signed-off-by: Doug Ledford <[email protected]>
1 parent 59caaed commit 50be28d

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

drivers/infiniband/ulp/ipoib/ipoib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ void ipoib_path_iter_read(struct ipoib_path_iter *iter,
548548

549549
int ipoib_mcast_attach(struct net_device *dev, u16 mlid,
550550
union ib_gid *mgid, int set_qkey);
551-
void ipoib_mcast_remove_list(struct net_device *dev, struct list_head *remove_list);
551+
void ipoib_mcast_remove_list(struct list_head *remove_list);
552552
void ipoib_check_and_add_mcast_sendonly(struct ipoib_dev_priv *priv, u8 *mgid,
553553
struct list_head *remove_list);
554554

drivers/infiniband/ulp/ipoib/ipoib_main.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,6 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv)
11501150
unsigned long flags;
11511151
int i;
11521152
LIST_HEAD(remove_list);
1153-
struct net_device *dev = priv->dev;
11541153

11551154
if (test_bit(IPOIB_STOP_NEIGH_GC, &priv->flags))
11561155
return;
@@ -1196,7 +1195,7 @@ static void __ipoib_reap_neigh(struct ipoib_dev_priv *priv)
11961195

11971196
out_unlock:
11981197
spin_unlock_irqrestore(&priv->lock, flags);
1199-
ipoib_mcast_remove_list(dev, &remove_list);
1198+
ipoib_mcast_remove_list(&remove_list);
12001199
}
12011200

12021201
static void ipoib_reap_neigh(struct work_struct *work)

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -723,12 +723,12 @@ void ipoib_check_and_add_mcast_sendonly(struct ipoib_dev_priv *priv, u8 *mgid,
723723
}
724724
}
725725

726-
void ipoib_mcast_remove_list(struct net_device *dev, struct list_head *remove_list)
726+
void ipoib_mcast_remove_list(struct list_head *remove_list)
727727
{
728728
struct ipoib_mcast *mcast, *tmcast;
729729

730730
list_for_each_entry_safe(mcast, tmcast, remove_list, list) {
731-
ipoib_mcast_leave(dev, mcast);
731+
ipoib_mcast_leave(mcast->dev, mcast);
732732
ipoib_mcast_free(mcast);
733733
}
734734
}
@@ -839,7 +839,7 @@ void ipoib_mcast_dev_flush(struct net_device *dev)
839839
if (test_bit(IPOIB_MCAST_FLAG_BUSY, &mcast->flags))
840840
wait_for_completion(&mcast->done);
841841

842-
ipoib_mcast_remove_list(dev, &remove_list);
842+
ipoib_mcast_remove_list(&remove_list);
843843
}
844844

845845
static int ipoib_mcast_addr_is_valid(const u8 *addr, const u8 *broadcast)
@@ -965,7 +965,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
965965
if (test_bit(IPOIB_MCAST_FLAG_BUSY, &mcast->flags))
966966
wait_for_completion(&mcast->done);
967967

968-
ipoib_mcast_remove_list(mcast->dev, &remove_list);
968+
ipoib_mcast_remove_list(&remove_list);
969969

970970
/*
971971
* Double check that we are still up

0 commit comments

Comments
 (0)