Skip to contentSkip to conversation

hv: util: catch allocation errors

PATCH New Olaf Hering 2 participants 3 messages Sep 30, 2015 Hyper-V/Azure core and drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hv: util: catch allocation errors

Catch allocation errors in hvt_op_write and hvutil_transport_send.

Fixes 14b50f80c32d ('Drivers: hv: util: introduce hv_utils_transport abstraction')
---
 drivers/hv/hv_utils_transport.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/hv/hv_utils_transport.c +8 -3
index 6a9d80a..13af065 100644
@@ -81,6 +81,8 @@ static ssize_t hvt_op_write(struct file *file, const char __user *buf,
 	hvt = container_of(file->f_op, struct hvutil_transport, fops);
 
 	inmsg = kzalloc(count, GFP_KERNEL);
+	if (!inmsg)
+		return -ENOMEM;
 	if (copy_from_user(inmsg, buf, count)) {
 		kfree(inmsg);
 		return -EFAULT;
@@ -204,9 +206,12 @@ int hvutil_transport_send(struct hvutil_transport *hvt, void *msg, int len)
 		goto out_unlock;
 	}
 	hvt->outmsg = kzalloc(len, GFP_KERNEL);
-	memcpy(hvt->outmsg, msg, len);
-	hvt->outmsg_len = len;
-	wake_up_interruptible(&hvt->outmsg_q);
+	if (hvt->outmsg) {
+		memcpy(hvt->outmsg, msg, len);
+		hvt->outmsg_len = len;
+		wake_up_interruptible(&hvt->outmsg_q);
+	} else
+		ret = -ENOMEM;
 out_unlock:
 	mutex_unlock(&hvt->outmsg_lock);
 	return ret;
#1 lore raw
coccinelle warnings: (new ones prefixed by >>)

Hi Olaf,

[auto build test results on v4.3-rc3 -- if it's inappropriate base, please ignore]

coccinelle warnings: (new ones prefixed by >>)

>> drivers/hv/hv_utils_transport.c:83:9-16: WARNING opportunity for memdup_user

Please review and possibly fold the followup patch.

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

#2 lore raw

[PATCH] hv: util: fix memdup_user.cocci warnings

In reply to Olaf Hering
drivers/hv/hv_utils_transport.c:83:9-16: WARNING opportunity for memdup_user

drivers/hv/hv_utils_transport.c:83:9-16: WARNING opportunity for memdup_user

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

Generated by: scripts/coccinelle/api/memdup_user.cocci

---

 0 files changed

rule starting on line 17: position variables or mixed modifs interfere with comm_assoc isobool ( (

(
(unknown *to == NULL)

  >>> IS_ERR(rule starting on line 17:to)

|
!unknown *to

  >>> IS_ERR(rule starting on line 17:to)

)
|
(unknown *NULL == unknown *to)

  >>> IS_ERR(rule starting on line 17:to)

) || ...)