From: Mark Salyzyn <salyzyn@google.com>
Date: Thu, 20 Aug 2015 21:21:34 +0000 (-0700)
Subject: pstore: pmsg: return -ENOMEM on vmalloc failure
X-Git-Tag: firefly_0821_release~3678^2~14
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9f55a4566d1fb8332f217ddc36026164a8515fcc;p=firefly-linux-kernel-4.4.55.git

pstore: pmsg: return -ENOMEM on vmalloc failure

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 23385441
Change-Id: I294cb72c25bddafbba4e64fdb0a18ae46655a05d
(cherry picked from commit 62bb84973c1d55a4cc35cc4d95cb723ce0aa2c0b)
---

diff --git a/fs/pstore/pmsg.c b/fs/pstore/pmsg.c
index db47810a92d8..82a86aacf2de 100644
--- a/fs/pstore/pmsg.c
+++ b/fs/pstore/pmsg.c
@@ -37,6 +37,8 @@ static ssize_t write_pmsg(struct file *file, const char __user *buf,
 	if (buffer_size > PMSG_MAX_BOUNCE_BUFFER_SIZE)
 		buffer_size = PMSG_MAX_BOUNCE_BUFFER_SIZE;
 	buffer = vmalloc(buffer_size);
+	if (!buffer)
+		return -ENOMEM;
 
 	mutex_lock(&pmsg_lock);
 	for (i = 0; i < count; ) {