Commit f4e58dc5 authored Oct 01, 2019 by Dotan Barak Committed by Greg Kroah-Hartman Oct 07, 2019

net/rds: Fix error handling in rds_ib_add_one()



[ Upstream commit d64bf89a75b65f83f06be9fb8f978e60d53752db ]

rds_ibdev:ipaddr_list and rds_ibdev:conn_list are initialized
after allocation some resources such as protection domain.
If allocation of such resources fail, then these uninitialized
variables are accessed in rds_ib_dev_free() in failure path. This
can potentially crash the system. The code has been updated to
initialize these variables very early in the function.

Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
Signed-off-by: Sudhakar Dindukurti <sudhakar.dindukurti@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 221b98bd

net/rds/ib.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -140,6 +140,9 @@ static void rds_ib_add_one(struct ib_device *device)
		refcount_set(&rds_ibdev->refcount, 1);
		INIT_WORK(&rds_ibdev->free_work, rds_ib_dev_free);

		INIT_LIST_HEAD(&rds_ibdev->ipaddr_list);
		INIT_LIST_HEAD(&rds_ibdev->conn_list);

		rds_ibdev->max_wrs = device->attrs.max_qp_wr;
		rds_ibdev->max_sge = min(device->attrs.max_sge, RDS_IB_MAX_SGE);

		@@ -199,9 +202,6 @@ static void rds_ib_add_one(struct ib_device *device)
		device->name,
		rds_ibdev->use_fastreg ? "FRMR" : "FMR");

		INIT_LIST_HEAD(&rds_ibdev->ipaddr_list);
		INIT_LIST_HEAD(&rds_ibdev->conn_list);

		down_write(&rds_ib_devices_lock);
		list_add_tail_rcu(&rds_ibdev->list, &rds_ib_devices);
		up_write(&rds_ib_devices_lock);