Unverified Commit 9abaf1ed authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6155 [sync] PR-5717: v2 fix CVE-2023-52587 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5717 
 
PR sync from: Yu Liao <liaoyu15@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/U2J3RS5UMVBWXJII3EDMWO4YP4OISISZ/ 
Daniel Vacek (1):
  IB/ipoib: Fix mcast list locking

Jack Wang (1):
  RDMA/IPoIB: Fix error code return in ipoib_mcast_join


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/I96G8W 
 
Link:https://gitee.com/openeuler/kernel/pulls/6155

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents ba7ea028 1411b117

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

+2 −5
Original line number Diff line number Diff line
@@ -542,21 +542,18 @@ static int ipoib_mcast_join(struct net_device *dev, struct ipoib_mcast *mcast) 
			/* SM supports sendonly-fullmember, otherwise fallback to full-member */

			rec.join_state = SENDONLY_FULLMEMBER_JOIN;

	}

	spin_unlock_irq(&priv->lock);



	multicast = ib_sa_join_multicast(&ipoib_sa_client, priv->ca, priv->port,

					 &rec, comp_mask, GFP_KERNEL,

					 &rec, comp_mask, GFP_ATOMIC,

					 ipoib_mcast_join_complete, mcast);

	spin_lock_irq(&priv->lock);

	if (IS_ERR(multicast)) {

		ret = PTR_ERR(multicast);

		ipoib_warn(priv, "ib_sa_join_multicast failed, status %d\n", ret);

		/* Requeue this join task with a backoff delay */

		__ipoib_mcast_schedule_join_thread(priv, mcast, 1);

		clear_bit(IPOIB_MCAST_FLAG_BUSY, &mcast->flags);

		spin_unlock_irq(&priv->lock);

		complete(&mcast->done);

		spin_lock_irq(&priv->lock);

		return ret;

	}

	return 0;

}