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

!15775 v2 CVE-2024-57857 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/DHWBDT3WVAUW7UAKNJQTUBNTGAQFRSMS/ 
CVE-2024-57857

Bernard Metzler (1):
  RDMA/siw: Remove direct link to net_device

Liu Jian (1):
  RDMA: Export ib_device_get_netdev()

 
https://gitee.com/src-openeuler/kernel/issues/IBI67U 
 
Link:https://gitee.com/openeuler/kernel/pulls/15775

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents e666d1a0 6143d78e

drivers/infiniband/core/device.c

+4 −0
Original line number Diff line number Diff line
@@ -2218,6 +2218,9 @@ struct net_device *ib_device_get_netdev(struct ib_device *ib_dev, 
	if (!rdma_is_port_valid(ib_dev, port))

		return NULL;



	if (!ib_dev->port_data)

		return NULL;



	pdata = &ib_dev->port_data[port];



	/*
@@ -2245,6 +2248,7 @@ struct net_device *ib_device_get_netdev(struct ib_device *ib_dev, 


	return res;

}

EXPORT_SYMBOL(ib_device_get_netdev);



/**

 * ib_device_get_by_netdev - Find an IB device associated with a netdev

drivers/infiniband/sw/siw/siw.h

+3 −4
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ 
 */

#define SIW_IRQ_MAXBURST_SQ_ACTIVE 4



/* There is always only a port 1 per siw device */

#define SIW_PORT 1



struct siw_dev_cap {

	int max_qp;

	int max_qp_wr;
@@ -69,16 +72,12 @@ struct siw_pd { 


struct siw_device {

	struct ib_device base_dev;

	struct net_device *netdev;

	struct siw_dev_cap attrs;



	u32 vendor_part_id;

	int numa_node;

	char raw_gid[ETH_ALEN];



	/* physical port state (only one port per device) */

	enum ib_port_state state;



	spinlock_t lock;



	struct xarray qp_xa;

drivers/infiniband/sw/siw/siw_cm.c

+21 −6
Original line number Diff line number Diff line
@@ -1778,6 +1778,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog) 
{

	struct socket *s;

	struct siw_cep *cep = NULL;

	struct net_device *ndev = NULL;

	struct siw_device *sdev = to_siw_dev(id->device);

	int addr_family = id->local_addr.ss_family;

	int rv = 0;
@@ -1798,9 +1799,15 @@ int siw_create_listen(struct iw_cm_id *id, int backlog) 
		struct sockaddr_in *laddr = &to_sockaddr_in(id->local_addr);



		/* For wildcard addr, limit binding to current device only */

		if (ipv4_is_zeronet(laddr->sin_addr.s_addr))

			s->sk->sk_bound_dev_if = sdev->netdev->ifindex;



		if (ipv4_is_zeronet(laddr->sin_addr.s_addr)) {

			ndev = ib_device_get_netdev(id->device, SIW_PORT);

			if (ndev) {

				s->sk->sk_bound_dev_if = ndev->ifindex;

			} else {

				rv = -ENODEV;

				goto error;

			}

		}

		rv = s->ops->bind(s, (struct sockaddr *)laddr,

				  sizeof(struct sockaddr_in));

	} else {
@@ -1816,9 +1823,15 @@ int siw_create_listen(struct iw_cm_id *id, int backlog) 
		}



		/* For wildcard addr, limit binding to current device only */

		if (ipv6_addr_any(&laddr->sin6_addr))

			s->sk->sk_bound_dev_if = sdev->netdev->ifindex;



		if (ipv6_addr_any(&laddr->sin6_addr)) {

			ndev = ib_device_get_netdev(id->device, SIW_PORT);

			if (ndev) {

				s->sk->sk_bound_dev_if = ndev->ifindex;

			} else {

				rv = -ENODEV;

				goto error;

			}

		}

		rv = s->ops->bind(s, (struct sockaddr *)laddr,

				  sizeof(struct sockaddr_in6));

	}
@@ -1879,6 +1892,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog) 
	}

	list_add_tail(&cep->listenq, (struct list_head *)id->provider_data);

	cep->state = SIW_EPSTATE_LISTENING;

	dev_put(ndev);



	siw_dbg(id->device, "Listen at laddr %pISp\n", &id->local_addr);
@@ -1902,6 +1916,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog) 
		siw_cep_put(cep);

	}

	sock_release(s);

	dev_put(ndev);



	return rv;

}

drivers/infiniband/sw/siw/siw_main.c

+1 −13
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ static struct siw_device *siw_device_create(struct net_device *netdev) 
		return NULL;



	base_dev = &sdev->base_dev;

	sdev->netdev = netdev;



	if (netdev->addr_len) {

		memcpy(sdev->raw_gid, netdev->dev_addr,
@@ -416,7 +415,6 @@ static int siw_netdev_event(struct notifier_block *nb, unsigned long event, 


	switch (event) {

	case NETDEV_UP:

		sdev->state = IB_PORT_ACTIVE;

		siw_port_event(sdev, 1, IB_EVENT_PORT_ACTIVE);

		break;
@@ -425,7 +423,6 @@ static int siw_netdev_event(struct notifier_block *nb, unsigned long event, 
		break;



	case NETDEV_DOWN:

		sdev->state = IB_PORT_DOWN;

		siw_port_event(sdev, 1, IB_EVENT_PORT_ERR);

		break;
@@ -446,12 +443,8 @@ static int siw_netdev_event(struct notifier_block *nb, unsigned long event, 
		siw_port_event(sdev, 1, IB_EVENT_LID_CHANGE);

		break;

	/*

	 * Todo: Below netdev events are currently not handled.

	 * All other events are not handled

	 */

	case NETDEV_CHANGEMTU:

	case NETDEV_CHANGE:

		break;



	default:

		break;

	}
@@ -482,11 +475,6 @@ static int siw_newlink(const char *basedev_name, struct net_device *netdev) 
	if (sdev) {

		dev_dbg(&netdev->dev, "siw: new device\n");



		if (netif_running(netdev) && netif_carrier_ok(netdev))

			sdev->state = IB_PORT_ACTIVE;

		else

			sdev->state = IB_PORT_DOWN;



		rv = siw_device_register(sdev, basedev_name);

		if (rv)

			ib_dealloc_device(&sdev->base_dev);

drivers/infiniband/sw/siw/siw_verbs.c

+24 −11
Original line number Diff line number Diff line
@@ -165,21 +165,29 @@ int siw_query_device(struct ib_device *base_dev, struct ib_device_attr *attr, 
int siw_query_port(struct ib_device *base_dev, u32 port,

		   struct ib_port_attr *attr)

{

	struct siw_device *sdev = to_siw_dev(base_dev);

	struct net_device *ndev;

	int rv;



	memset(attr, 0, sizeof(*attr));



	rv = ib_get_eth_speed(base_dev, port, &attr->active_speed,

			 &attr->active_width);

	if (rv)

		return rv;



	ndev = ib_device_get_netdev(base_dev, SIW_PORT);

	if (!ndev)

		return -ENODEV;



	attr->gid_tbl_len = 1;

	attr->max_msg_sz = -1;

	attr->max_mtu = ib_mtu_int_to_enum(sdev->netdev->mtu);

	attr->active_mtu = ib_mtu_int_to_enum(sdev->netdev->mtu);

	attr->phys_state = sdev->state == IB_PORT_ACTIVE ?

	attr->max_mtu = ib_mtu_int_to_enum(ndev->max_mtu);

	attr->active_mtu = ib_mtu_int_to_enum(READ_ONCE(ndev->mtu));

	attr->phys_state = (netif_running(ndev) && netif_carrier_ok(ndev)) ?

		IB_PORT_PHYS_STATE_LINK_UP : IB_PORT_PHYS_STATE_DISABLED;

	attr->state = attr->phys_state == IB_PORT_PHYS_STATE_LINK_UP ?

		IB_PORT_ACTIVE : IB_PORT_DOWN;

	attr->port_cap_flags = IB_PORT_CM_SUP | IB_PORT_DEVICE_MGMT_SUP;

	attr->state = sdev->state;

	/*

	 * All zero

	 *
@@ -193,6 +201,7 @@ int siw_query_port(struct ib_device *base_dev, u32 port, 
	 * attr->subnet_timeout = 0;

	 * attr->init_type_repy = 0;

	 */

	dev_put(ndev);

	return rv;

}
@@ -507,20 +516,23 @@ int siw_query_qp(struct ib_qp *base_qp, struct ib_qp_attr *qp_attr, 
		 int qp_attr_mask, struct ib_qp_init_attr *qp_init_attr)

{

	struct siw_qp *qp;

	struct siw_device *sdev;

	struct net_device *ndev;



	if (base_qp && qp_attr && qp_init_attr) {

	if (base_qp && qp_attr && qp_init_attr)

		qp = to_siw_qp(base_qp);

		sdev = to_siw_dev(base_qp->device);

	} else {

	else

		return -EINVAL;

	}



	ndev = ib_device_get_netdev(base_qp->device, SIW_PORT);

	if (!ndev)

		return -ENODEV;



	qp_attr->cap.max_inline_data = SIW_MAX_INLINE;

	qp_attr->cap.max_send_wr = qp->attrs.sq_size;

	qp_attr->cap.max_send_sge = qp->attrs.sq_max_sges;

	qp_attr->cap.max_recv_wr = qp->attrs.rq_size;

	qp_attr->cap.max_recv_sge = qp->attrs.rq_max_sges;

	qp_attr->path_mtu = ib_mtu_int_to_enum(sdev->netdev->mtu);

	qp_attr->path_mtu = ib_mtu_int_to_enum(READ_ONCE(ndev->mtu));

	qp_attr->max_rd_atomic = qp->attrs.irq_size;

	qp_attr->max_dest_rd_atomic = qp->attrs.orq_size;
@@ -535,6 +547,7 @@ int siw_query_qp(struct ib_qp *base_qp, struct ib_qp_attr *qp_attr, 


	qp_init_attr->cap = qp_attr->cap;



	dev_put(ndev);

	return 0;

}