Skip to contentSkip to conversation

s390/chsc: Switch over to memdup_user()

PATCH In review Jiapeng Chong 2 participants 2 messages Jan 18, 2023

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

PATCH v2 1/1 s390/chsc: Switch over to memdup_user()

Use memdup_user rather than duplicating its implementation, this is a little bit restricted to reduce false positives.

./drivers/s390/cio/chsc_sch.c:703:7-14: WARNING opportunity for memdup_user.

---
Changes in v2:
-Add free_page((unsigned long)sccl_area);

 drivers/s390/cio/chsc_sch.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/s390/cio/chsc_sch.c +6 -8
index 180ab899289c..09dcce7ff24b 100644
@@ -700,15 +700,13 @@ static int chsc_ioctl_conf_comp_list(void __user *user_ccl)
 	sccl_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
 	if (!sccl_area)
 		return -ENOMEM;
-	ccl = kzalloc(sizeof(*ccl), GFP_KERNEL);
-	if (!ccl) {
-		ret = -ENOMEM;
-		goto out_free;
-	}
-	if (copy_from_user(ccl, user_ccl, sizeof(*ccl))) {
-		ret = -EFAULT;
-		goto out_free;
+
+	ccl = memdup_user(user_ccl, sizeof(*ccl));
+	if (IS_ERR(ccl)) {
+		free_page((unsigned long)sccl_area);
+		return PTR_ERR(ccl);
 	}
+
 	sccl_area->request.length = 0x0020;
 	sccl_area->request.code = 0x0030;
 	sccl_area->fmt = ccl->req.fmt;
Signature · 1 line
2.20.1.7.g153144c
#1 lore raw
Quoted 32 lines · Jiapeng Chong

Use memdup_user rather than duplicating its implementation, this is a little bit restricted to reduce false positives.

./drivers/s390/cio/chsc_sch.c:703:7-14: WARNING opportunity for memdup_user.

---
Changes in v2:
-Add free_page((unsigned long)sccl_area);

 drivers/s390/cio/chsc_sch.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/s390/cio/chsc_sch.c +0 -8
index 180ab899289c..09dcce7ff24b 100644
@@ -700,15 +700,13 @@ static int chsc_ioctl_conf_comp_list(void __user *user_ccl)
 	sccl_area = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
 	if (!sccl_area)
 		return -ENOMEM;
-	ccl = kzalloc(sizeof(*ccl), GFP_KERNEL);
-	if (!ccl) {
-		ret = -ENOMEM;
-		goto out_free;
-	}
-	if (copy_from_user(ccl, user_ccl, sizeof(*ccl))) {
-		ret = -EFAULT;
-		goto out_free;

drivers/s390/cio/chsc_sch.c static int chsc_ioctl_conf_comp_list(void __user *user_ccl) · line 712

Quoted 10 lines
drivers/s390/cio/chsc_sch.c +6 -0
+
+	ccl = memdup_user(user_ccl, sizeof(*ccl));
+	if (IS_ERR(ccl)) {
+		free_page((unsigned long)sccl_area);
+		return PTR_ERR(ccl);
 	}
+
 	sccl_area->request.length = 0x0020;
 	sccl_area->request.code = 0x0030;
 	sccl_area->fmt = ccl->req.fmt;

Such a change would have to address other similar patterns in this source. Besides, it is not that obvious that swapping GFP_KERNEL for GFP_USER (memdup_user() is called with) is issue-free.