aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-09-10 13:46:21 -0700
committerKevin Hilman <khilman@linaro.org>2015-09-10 13:46:21 -0700
commit6c5cc590aee3a2602edfa907120e6c1f6d0dc0e4 (patch)
treecb8e8360032ceca177bf3aaba23f6313ad80c014 /fs
parent07c57548539dbeeb3c4d3766b02eaf4b2d945f8f (diff)
parent888c0a894442cbc546c6b0b7bcd4a384f0509609 (diff)
Merge branch 'linaro-android-3.14-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.14-android
* 'linaro-android-3.14-lsk' of git://android.git.linaro.org/kernel/linaro-android: android: configs: base: enable IPV6 arm64 Kconfig: Move LIST_POISON to a safe value sysrq: Emergency Remount R/O in reverse order pstore: pmsg: return -ENOMEM on vmalloc failure wakeup_reason: use vsnprintf instead of snsprintf for vargs.
Diffstat (limited to 'fs')
-rw-r--r--fs/pstore/pmsg.c2
-rw-r--r--fs/super.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/pstore/pmsg.c b/fs/pstore/pmsg.c
index feb5dd2948b4..5a2f05a16c1e 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; ) {
diff --git a/fs/super.c b/fs/super.c
index 440ef51cd696..819283aee703 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -762,7 +762,7 @@ static void do_emergency_remount(struct work_struct *work)
struct super_block *sb, *p = NULL;
spin_lock(&sb_lock);
- list_for_each_entry(sb, &super_blocks, s_list) {
+ list_for_each_entry_reverse(sb, &super_blocks, s_list) {
if (hlist_unhashed(&sb->s_instances))
continue;
sb->s_count++;