From af4502d2a19b0e91346db4976632449614201dcd Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 19 Jan 2013 22:13:34 -0500 Subject: [PATCH] --- yaml --- r: 348925 b: refs/heads/master c: b1e0318b8cd4bdbb0fbc48967b0350483ad9bd69 h: refs/heads/master i: 348923: f858c25f274fd17d7a00be55501bb86e2891c985 v: v3 --- [refs] | 2 +- trunk/kernel/fork.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4d7b74d051a1..d6830e6bb438 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43b16820249396aea7eb57c747106e211e54bed5 +refs/heads/master: b1e0318b8cd4bdbb0fbc48967b0350483ad9bd69 diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index a31b823b3c2d..e05cff2429b5 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -1660,8 +1660,10 @@ SYSCALL_DEFINE5(clone, unsigned long, clone_flags, unsigned long, newsp, int, tls_val) #endif { - return do_fork(clone_flags, newsp, 0, - parent_tidptr, child_tidptr); + long ret = do_fork(clone_flags, newsp, 0, parent_tidptr, child_tidptr); + asmlinkage_protect(5, ret, clone_flags, newsp, + parent_tidptr, child_tidptr, tls_val); + return ret; } #endif