Skip to contentSkip to conversation

s390/chsc: Switch over to memdup_user()

PATCH Superseded Jiapeng Chong 2 participants 2 messages Jan 17, 2023

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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.

---
 drivers/s390/cio/chsc_sch.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/s390/cio/chsc_sch.c +5 -9
index 180ab899289c..097769a955c3 100644
@@ -700,15 +700,11 @@ 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))
+		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

Am 17.01.23 um 07:04 schrieb Jiapeng Chong:

Quoted 23 lines

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.

---
  drivers/s390/cio/chsc_sch.c | 14 +++++---------
  1 file changed, 5 insertions(+), 9 deletions(-)
drivers/s390/cio/chsc_sch.c +0 -3
index 180ab899289c..097769a955c3 100644
@@ -700,15 +700,11 @@ 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;

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

Quoted 10 lines
drivers/s390/cio/chsc_sch.c +4 -6
-		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))
+		return PTR_ERR(ccl);

The old code did free sccl_area your code does not.

Quoted 4 lines
drivers/s390/cio/chsc_sch.c +1 -0
+
  	sccl_area->request.length = 0x0020;
  	sccl_area->request.code = 0x0030;
  	sccl_area->fmt = ccl->req.fmt;