diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 23:33:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 23:33:42 +0200 |
| commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
| tree | c92d5684a866542b1cb20641607ac1643ce03a47 /arch/s390 | |
| parent | [NETNS]: Use TCP control socket from a correct namespace. (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| download | linux-3bb5da3837cc1aa17736b05139c9a22c3794851a.tar.xz linux-3bb5da3837cc1aa17736b05139c9a22c3794851a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/lib/uaccess_pt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c index 7e8efaade2ea..5efdfe9f5e76 100644 --- a/arch/s390/lib/uaccess_pt.c +++ b/arch/s390/lib/uaccess_pt.c @@ -406,6 +406,8 @@ int futex_atomic_cmpxchg_pt(int __user *uaddr, int oldval, int newval) { int ret; + if (!current->mm) + return -EFAULT; spin_lock(¤t->mm->page_table_lock); uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr); if (!uaddr) { |