diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-10 13:46:21 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-10 13:46:21 -0700 |
| commit | 6c5cc590aee3a2602edfa907120e6c1f6d0dc0e4 (patch) | |
| tree | cb8e8360032ceca177bf3aaba23f6313ad80c014 | |
| parent | 07c57548539dbeeb3c4d3766b02eaf4b2d945f8f (diff) | |
| parent | 888c0a894442cbc546c6b0b7bcd4a384f0509609 (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.
| -rw-r--r-- | android/configs/android-base.cfg | 1 | ||||
| -rw-r--r-- | arch/arm64/Kconfig | 4 | ||||
| -rw-r--r-- | fs/pstore/pmsg.c | 2 | ||||
| -rw-r--r-- | fs/super.c | 2 | ||||
| -rw-r--r-- | kernel/power/wakeup_reason.c | 2 |
5 files changed, 9 insertions, 2 deletions
diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg index 81ac35850d5a..ad32ede883b9 100644 --- a/android/configs/android-base.cfg +++ b/android/configs/android-base.cfg @@ -35,6 +35,7 @@ CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y CONFIG_IP6_NF_TARGET_REJECT=y CONFIG_IP6_NF_TARGET_REJECT_SKERR=y +CONFIG_IPV6=y CONFIG_IPV6_MIP6=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_OPTIMISTIC_DAD=y diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 196d179119ff..58e9949b5cc7 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -84,6 +84,10 @@ config MMU config NO_IOPORT def_bool y +config ILLEGAL_POINTER_VALUE + hex + default 0xdead000000000000 + config STACKTRACE_SUPPORT def_bool y 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++; diff --git a/kernel/power/wakeup_reason.c b/kernel/power/wakeup_reason.c index 76b53400cb16..f18fb168d8c2 100644 --- a/kernel/power/wakeup_reason.c +++ b/kernel/power/wakeup_reason.c @@ -151,7 +151,7 @@ void log_suspend_abort_reason(const char *fmt, ...) suspend_abort = true; va_start(args, fmt); - snprintf(abort_reason, MAX_SUSPEND_ABORT_LEN, fmt, args); + vsnprintf(abort_reason, MAX_SUSPEND_ABORT_LEN, fmt, args); va_end(args); spin_unlock(&resume_reason_lock); } |