linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] IB/hfi1: Fix possible null-pointer dereference in _extend_sdma_tx_descs()
@ 2021-08-05 12:24 Tuo Li
  2021-08-05 17:46 ` Marciniszyn, Mike
  0 siblings, 1 reply; 2+ messages in thread
From: Tuo Li @ 2021-08-05 12:24 UTC (permalink / raw)
  To: mike.marciniszyn, dennis.dalessandro, dledford, jgg
  Cc: linux-rdma, linux-kernel, baijiaju1990, Tuo Li, TOTE Robot

kmalloc_array() is called to allocate memory for tx->descp. If it fails, 
the function __sdma_txclean() is called:
  __sdma_txclean(dd, tx);

However, in the function __sdma_txclean(), tx-descp is dereferenced if 
tx->num_desc is not zero:
  sdma_unmap_desc(dd, &tx->descp[0]);

To fix this possible null-pointer dereference, assign 0 to tx->num_desc if
kmalloc_array() returns NULL.

Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Tuo Li <islituo@gmail.com>
---
 drivers/infiniband/hw/hfi1/sdma.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/infiniband/hw/hfi1/sdma.c b/drivers/infiniband/hw/hfi1/sdma.c
index eb15c310d63d..00e29c3dfe96 100644
--- a/drivers/infiniband/hw/hfi1/sdma.c
+++ b/drivers/infiniband/hw/hfi1/sdma.c
@@ -3079,8 +3079,10 @@ static int _extend_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx)
 			MAX_DESC,
 			sizeof(struct sdma_desc),
 			GFP_ATOMIC);
-	if (!tx->descp)
+	if (!tx->descp) {
+		tx->num_desc = 0;
 		goto enomem;
+	}
 
 	/* reserve last descriptor for coalescing */
 	tx->desc_limit = MAX_DESC - 1;
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-08-05 17:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-05 12:24 [PATCH] IB/hfi1: Fix possible null-pointer dereference in _extend_sdma_tx_descs() Tuo Li
2021-08-05 17:46 ` Marciniszyn, Mike

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).