Commit 3c91c909 authored by Zhipeng Lu's avatar Zhipeng Lu Committed by Paolo Abeni
Browse files

octeontx2-af: fix a use-after-free in rvu_npa_register_reporters 



The rvu_dl will be freed in rvu_npa_health_reporters_destroy(rvu_dl)
after the create_workqueue fails, and after that free, the rvu_dl will
be translate back through rvu_npa_health_reporters_create,
rvu_health_reporters_create, and rvu_register_dl. Finally it goes to the
err_dl_health label, being freed again in
rvu_health_reporters_destroy(rvu) by rvu_npa_health_reporters_destroy.
In the second calls of rvu_npa_health_reporters_destroy, however,
it uses rvu_dl->rvu_npa_health_reporter, which is already freed at
the end of rvu_npa_health_reporters_destroy in the first call.

So this patch prevents the first destroy by instantly returning -ENONMEN
when create_workqueue fails. In addition, since the failure of
create_workqueue is the only entrence of label err, it has been
integrated into the error-handling path of create_workqueue.

Fixes: f1168d1e ("octeontx2-af: Add devlink health reporters for NPA")
Signed-off-by: default avatarZhipeng Lu <alexious@zju.edu.cn>
Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Acked-by: default avatarGeethasowjanya Akula <gakula@marvell.com>
Link: https://lore.kernel.org/r/20231202095902.3264863-1-alexious@zju.edu.cn


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 37e4b8df

drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c

+1 −4
Original line number Diff line number Diff line
@@ -1087,7 +1087,7 @@ static int rvu_npa_register_reporters(struct rvu_devlink *rvu_dl) 


	rvu_dl->devlink_wq = create_workqueue("rvu_devlink_wq");

	if (!rvu_dl->devlink_wq)

		goto err;

		return -ENOMEM;



	INIT_WORK(&rvu_reporters->intr_work, rvu_npa_intr_work);

	INIT_WORK(&rvu_reporters->err_work, rvu_npa_err_work);
@@ -1095,9 +1095,6 @@ static int rvu_npa_register_reporters(struct rvu_devlink *rvu_dl) 
	INIT_WORK(&rvu_reporters->ras_work, rvu_npa_ras_work);



	return 0;

err:

	rvu_npa_health_reporters_destroy(rvu_dl);

	return -ENOMEM;

}



static int rvu_npa_health_reporters_create(struct rvu_devlink *rvu_dl)