Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fa2d4fb authored by Mark Bloch's avatar Mark Bloch Committed by Doug Ledford
Browse files

IB/core: Fix a potential array overrun in CMA and SA agent 



Fix array overrun when going over callback table.
In declaration of callback table, the max size isn't provided and
in registration phase, it is provided.

There is potential scenario where a new operation is added
and it is not supported by current client. The acceptance of
such operation by ib_netlink will cause to array overrun.

Fixes: 809d5fc9 ("infiniband: pass rdma_cm module to netlink_dump_start")
Fixes: b493d91d ("iwcm: common code for port mapper")
Fixes: 2ca546b9 ("IB/sa: Route SA pathrecord query through netlink")
Signed-off-by: default avatarMark Bloch <markb@mellanox.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 1ae5ccc7

drivers/infiniband/core/cma.c

+2 −1
Original line number Diff line number Diff line
@@ -4294,7 +4294,8 @@ static int __init cma_init(void) 
	if (ret)

		goto err;



	if (ibnl_add_client(RDMA_NL_RDMA_CM, RDMA_NL_RDMA_CM_NUM_OPS, cma_cb_table))

	if (ibnl_add_client(RDMA_NL_RDMA_CM, ARRAY_SIZE(cma_cb_table),

			    cma_cb_table))

		pr_warn("RDMA CMA: failed to add netlink callback\n");

	cma_configfs_init();

drivers/infiniband/core/iwcm.c

+1 −1
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ static int __init iw_cm_init(void) 
	if (ret)

		pr_err("iw_cm: couldn't init iwpm\n");



	ret = ibnl_add_client(RDMA_NL_IWCM, RDMA_NL_IWPM_NUM_OPS,

	ret = ibnl_add_client(RDMA_NL_IWCM, ARRAY_SIZE(iwcm_nl_cb_table),

			      iwcm_nl_cb_table);

	if (ret)

		pr_err("iw_cm: couldn't register netlink callbacks\n");

drivers/infiniband/core/sa_query.c

+1 −1
Original line number Diff line number Diff line
@@ -1820,7 +1820,7 @@ static int __init ib_sa_init(void) 
		goto err3;

	}



	if (ibnl_add_client(RDMA_NL_LS, RDMA_NL_LS_NUM_OPS,

	if (ibnl_add_client(RDMA_NL_LS, ARRAY_SIZE(ib_sa_cb_table),

			    ib_sa_cb_table)) {

		pr_err("Failed to add netlink callback\n");

		ret = -EINVAL;