Merge 4.14.72 into android-4.14-p

[GitHub/LineageOS/android_kernel_motorola_exynos9610.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 9069886d38da949c7829c0a94358e595da851741..08e1ae0bf491d2c39746f44b7bb643960b31b972 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5705,6 +5705,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
                unsigned long sp;
                unsigned int rem;
                u64 dyn_size;
+               mm_segment_t fs;
 
                /*
                 * We dump:
@@ -5722,7 +5723,10 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
 
                /* Data. */
                sp = perf_user_stack_pointer(regs);
+               fs = get_fs();
+               set_fs(USER_DS);
                rem = __output_copy_user(handle, (void *) sp, dump_size);
+               set_fs(fs);
                dyn_size = dump_size - rem;
 
                perf_output_skip(handle, rem);