Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a3c74c52570c0c4ac90c9a0216de800c39089ba7

Authored by Namhyung Kim
Committed by Thomas Gleixner
1 parent 1dcc41bb03
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

futex: Mark restart_block.futex.uaddr[2] __user 

@uaddr and @uaddr2 fields in restart_block.futex are user
pointers. Add __user and remove unnecessary casts.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Darren Hart <dvhltc@us.ibm.com>
LKML-Reference: <1284468228-8723-2-git-send-email-namhyung@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

include/linux/thread_info.h
Diff comments   View file @ a3c74c5
... ... @@ -23,12 +23,12 @@
23 23 };
24 24 /* For futex_wait and futex_wait_requeue_pi */
25 25 struct {
26   - u32 *uaddr;
  26 + u32 __user *uaddr;
27 27 u32 val;
28 28 u32 flags;
29 29 u32 bitset;
30 30 u64 time;
31   - u32 *uaddr2;
  31 + u32 __user *uaddr2;
32 32 } futex;
33 33 /* For nanosleep */
34 34 struct {
... ... @@ -1843,7 +1843,7 @@
1843 1843  
1844 1844 restart = &current_thread_info()->restart_block;
1845 1845 restart->fn = futex_wait_restart;
1846   - restart->futex.uaddr = (u32 *)uaddr;
  1846 + restart->futex.uaddr = uaddr;
1847 1847 restart->futex.val = val;
1848 1848 restart->futex.time = abs_time->tv64;
1849 1849 restart->futex.bitset = bitset;
... ... @@ -1869,7 +1869,7 @@
1869 1869  
1870 1870 static long futex_wait_restart(struct restart_block *restart)
1871 1871 {
1872   - u32 __user *uaddr = (u32 __user *)restart->futex.uaddr;
  1872 + u32 __user *uaddr = restart->futex.uaddr;
1873 1873 int fshared = 0;
1874 1874 ktime_t t, *tp = NULL;
1875 1875