Skip to contentSkip to conversation

drivers/infiniband: copy userspace arrays safely

PATCH Applied Philipp Stanner 3 participants 3 messages Nov 2, 2023 – Nov 13, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/infiniband: copy userspace arrays safely

Currently, memdup_user() is utilized at two positions to copy userspace arrays. This is done without overflow checks.

Use the new wrapper memdup_array_user() to copy the arrays more safely.

---
 drivers/infiniband/hw/hfi1/user_exp_rcv.c | 4 ++--
 drivers/infiniband/hw/hfi1/user_sdma.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/infiniband/hw/hfi1/user_exp_rcv.c +2 -2
index 96058baf36ed..53a623892d9d 100644
@@ -491,8 +491,8 @@ int hfi1_user_exp_rcv_clear(struct hfi1_filedata *fd,
 	if (unlikely(tinfo->tidcnt > fd->tid_used))
 		return -EINVAL;
 
-	tidinfo = memdup_user(u64_to_user_ptr(tinfo->tidlist),
-			      sizeof(tidinfo[0]) * tinfo->tidcnt);
+	tidinfo = memdup_array_user(u64_to_user_ptr(tinfo->tidlist),
+				    tinfo->tidcnt, sizeof(tidinfo[0]));
 	if (IS_ERR(tidinfo))
 		return PTR_ERR(tidinfo);
 
drivers/infiniband/hw/hfi1/user_sdma.c +2 -2
index 29ae7beb9b03..f7fa8e699a78 100644
@@ -494,8 +494,8 @@ int hfi1_user_sdma_process_request(struct hfi1_filedata *fd,
 		 * equal to the pkt count. However, there is no way to
 		 * tell at this point.
 		 */
-		tmp = memdup_user(iovec[idx].iov_base,
-				  ntids * sizeof(*req->tids));
+		tmp = memdup_array_user(iovec[idx].iov_base,
+					ntids, sizeof(*req->tids));
 		if (IS_ERR(tmp)) {
 			ret = PTR_ERR(tmp);
 			SDMA_DBG(req, "Failed to copy %d TIDs (%d)",
Signature · 1 line
2.41.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 32 lines · Philipp Stanner

Currently, memdup_user() is utilized at two positions to copy userspace arrays. This is done without overflow checks.

Use the new wrapper memdup_array_user() to copy the arrays more safely.

---
 drivers/infiniband/hw/hfi1/user_exp_rcv.c | 4 ++--
 drivers/infiniband/hw/hfi1/user_sdma.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/infiniband/hw/hfi1/user_exp_rcv.c +2 -2
index 96058baf36ed..53a623892d9d 100644
@@ -491,8 +491,8 @@ int hfi1_user_exp_rcv_clear(struct hfi1_filedata *fd,
 	if (unlikely(tinfo->tidcnt > fd->tid_used))
 		return -EINVAL;
 
-	tidinfo = memdup_user(u64_to_user_ptr(tinfo->tidlist),
-			      sizeof(tidinfo[0]) * tinfo->tidcnt);
+	tidinfo = memdup_array_user(u64_to_user_ptr(tinfo->tidlist),
+				    tinfo->tidcnt, sizeof(tidinfo[0]));
 	if (IS_ERR(tidinfo))
 		return PTR_ERR(tidinfo);
 
drivers/infiniband/hw/hfi1/user_sdma.c +0 -0
index 29ae7beb9b03..f7fa8e699a78 100644

drivers/infiniband/hw/hfi1/user_sdma.c int hfi1_user_sdma_process_request(struct hfi1_filedata *fd, · line 501

Quoted 10 lines
drivers/infiniband/hw/hfi1/user_sdma.c +2 -2
@@ -494,8 +494,8 @@ int hfi1_user_sdma_process_request(struct hfi1_filedata *fd,
 		 * equal to the pkt count. However, there is no way to
 		 * tell at this point.
 		 */
-		tmp = memdup_user(iovec[idx].iov_base,
-				  ntids * sizeof(*req->tids));
+		tmp = memdup_array_user(iovec[idx].iov_base,
+					ntids, sizeof(*req->tids));
 		if (IS_ERR(tmp)) {
 			ret = PTR_ERR(tmp);
 			SDMA_DBG(req, "Failed to copy %d TIDs (%d)",