diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-02-23 08:20:22 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-02-23 08:20:22 -0500 |
| commit | 0202b160bd4eb7a82942a233d209b0a4acb4666c (patch) | |
| tree | 7c999d2aa334b686a76aa4397352eac7f4eecb06 /mm/mempolicy.c | |
| parent | 3cbae07b51cc7564bd3fe8401b7ede5b783cb92c (diff) | |
| parent | f5f23ec8d572816c7ff9c6e5eb0c209c9faa008e (diff) | |
Merge pobox.com:/garz/repo/netdev-2.6/r8169
into pobox.com:/garz/repo/net-drivers-2.6
Diffstat (limited to 'mm/mempolicy.c')
| -rw-r--r-- | mm/mempolicy.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index c50402632c6d..1511786462f3 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -524,9 +524,13 @@ asmlinkage long sys_get_mempolicy(int __user *policy, } else pval = pol->policy; - err = -EFAULT; + if (vma) { + up_read(¤t->mm->mmap_sem); + vma = NULL; + } + if (policy && put_user(pval, policy)) - goto out; + return -EFAULT; err = 0; if (nmask) { |