From: Peter Huewe Date: Thu, 7 Jan 2010 18:57:36 +0000 (+0100) Subject: Staging: asus_oled: Add NULL test for kmalloc X-Git-Tag: MMI-PSA29.97-13-9~24618^2~1^2~222 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0df28be06e08b9a53c26a53974bf3afea4928b3e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Staging: asus_oled: Add NULL test for kmalloc This patch adds a NULL test to check wether kmalloc was successful or not. Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c index 0c1fb0d618a5..c597fb27bd53 100644 --- a/drivers/staging/asus_oled/asus_oled.c +++ b/drivers/staging/asus_oled/asus_oled.c @@ -430,6 +430,11 @@ static ssize_t odev_set_picture(struct asus_oled_dev *odev, kfree(odev->buf); odev->buf = kmalloc(odev->buf_size, GFP_KERNEL); + if (odev->buf == NULL) { + odev->buf_size = 0; + printk(ASUS_OLED_ERROR "Out of memory!\n"); + return -ENOMEM; + } memset(odev->buf, 0xff, odev->buf_size);