diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-08-20 14:21:34 -0700 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2016-02-05 10:20:19 -0800 |
| commit | f42f134317468171639b4373983007044081c555 (patch) | |
| tree | 147e3e4f4e1e2b7c5c9d5763cae998f667fe15ff | |
| parent | c3b958d9a4b39206b6a11cea113a01a4c55c0c24 (diff) | |
pstore: pmsg: return -ENOMEM on vmalloc failureandroid-n-preview-1_r0.5
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 23385441
Change-Id: I294cb72c25bddafbba4e64fdb0a18ae46655a05d
| -rw-r--r-- | fs/pstore/pmsg.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; ) { |