* [folded-merged] prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v4-fix-2.patch removed from -mm tree
@ 2014-10-09 20:37 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2014-10-09 20:37 UTC (permalink / raw
To: gorcunov, dan.carpenter, mm-commits
The patch titled
Subject: prctl: return -EFAULT on auxv fetching failure
has been removed from the -mm tree. Its filename was
prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v4-fix-2.patch
This patch was dropped because it was folded into prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v3.patch
------------------------------------------------------
From: Cyrill Gorcunov <gorcunov@gmail.com>
Subject: prctl: return -EFAULT on auxv fetching failure
Dan reported that returning bytes left if copy_from_user failed
is a bad option, return traditional -EFAULT instead.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
kernel/sys.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff -puN kernel/sys.c~prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v4-fix-2 kernel/sys.c
--- a/kernel/sys.c~prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v4-fix-2
+++ a/kernel/sys.c
@@ -1809,11 +1809,10 @@ static int prctl_set_mm_map(int opt, con
if (prctl_map.auxv_size) {
memset(user_auxv, 0, sizeof(user_auxv));
- error = copy_from_user(user_auxv,
- (const void __user *)prctl_map.auxv,
- prctl_map.auxv_size);
- if (error)
- return error;
+ if (copy_from_user(user_auxv,
+ (const void __user *)prctl_map.auxv,
+ prctl_map.auxv_size))
+ return -EFAULT;
/* Last entry must be AT_NULL as specification requires */
user_auxv[AT_VECTOR_SIZE - 2] = AT_NULL;
_
Patches currently in -mm which might be from gorcunov@gmail.com are
origin.patch
mm-remove-misleading-arch_uses_numa_prot_none.patch
prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v3.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-10-09 20:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-09 20:37 [folded-merged] prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v4-fix-2.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.