From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754969AbbI3JFa (ORCPT ); Wed, 30 Sep 2015 05:05:30 -0400 Received: from mo4-p04-ob.smtp.rzone.de ([81.169.146.177]:57852 "EHLO mo4-p04-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754623AbbI3JFV (ORCPT ); Wed, 30 Sep 2015 05:05:21 -0400 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+yackYocTD1iAi8x+OWtqWFmrC5F/k8792rbtkQ== From: Olaf Hering To: kys@microsoft.com, haiyangz@microsoft.com Cc: linux-kernel@vger.kernel.org, Olaf Hering Subject: [PATCH] hv: util: catch allocation errors Date: Wed, 30 Sep 2015 09:05:11 +0000 Message-Id: <1443603911-25696-1-git-send-email-olaf@aepfle.de> X-Mailer: git-send-email 2.5.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Catch allocation errors in hvt_op_write and hvutil_transport_send. Fixes: 14b50f80c32d ('Drivers: hv: util: introduce hv_utils_transport abstraction') Signed-off-by: Olaf Hering --- drivers/hv/hv_utils_transport.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/hv/hv_utils_transport.c b/drivers/hv/hv_utils_transport.c index 6a9d80a..13af065 100644 --- a/drivers/hv/hv_utils_transport.c +++ b/drivers/hv/hv_utils_transport.c @@ -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;