diff options
author | Will Deacon <will.deacon@arm.com> | 2013-08-21 13:24:47 -0400 |
---|---|---|
committer | Eric Van Hensbergen <ericvh@gmail.com> | 2013-08-26 11:28:46 -0400 |
commit | 50192abe02929586111fb33f216060a9341875f1 (patch) | |
tree | c766629c78fc8410eb452e018b0ba4b629141a3e /net | |
parent | e0d6cb9cd3a3ac8a3b8e5b22b83c4f8619786f22 (diff) |
fs/9p: avoid accessing utsname after namespace has been torn down
During trinity fuzzing in a kvmtool guest, I stumbled across the
following:
Unable to handle kernel NULL pointer dereference at virtual address 00000004
PC is at v9fs_file_do_lock+0xc8/0x1a0
LR is at v9fs_file_do_lock+0x48/0x1a0
[<c01e2ed0>] (v9fs_file_do_lock+0xc8/0x1a0) from [<c0119154>] (locks_remove_flock+0x8c/0x124)
[<c0119154>] (locks_remove_flock+0x8c/0x124) from [<c00d9bf0>] (__fput+0x58/0x1e4)
[<c00d9bf0>] (__fput+0x58/0x1e4) from [<c0044340>] (task_work_run+0xac/0xe8)
[<c0044340>] (task_work_run+0xac/0xe8) from [<c002e36c>] (do_exit+0x6bc/0x8d8)
[<c002e36c>] (do_exit+0x6bc/0x8d8) from [<c002e674>] (do_group_exit+0x3c/0xb0)
[<c002e674>] (do_group_exit+0x3c/0xb0) from [<c002e6f8>] (__wake_up_parent+0x0/0x18)
I believe this is due to an attempt to access utsname()->nodename, after
exit_task_namespaces() has been called, leaving current->nsproxy->uts_ns
as NULL and causing the above dereference.
A similar issue was fixed for lockd in 9a1b6bf818e7 ("LOCKD: Don't call
utsname()->nodename from nlmclnt_setlockargs"), so this patch attempts
something similar for 9pfs.
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Ron Minnich <rminnich@sandia.gov>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/9p/client.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 8b93cae2d11d..0e49b288e574 100644 --- a/net/9p/client.c +++ b/net/9p/client.c | |||
@@ -992,6 +992,7 @@ struct p9_client *p9_client_create(const char *dev_name, char *options) | |||
992 | { | 992 | { |
993 | int err; | 993 | int err; |
994 | struct p9_client *clnt; | 994 | struct p9_client *clnt; |
995 | char *client_id; | ||
995 | 996 | ||
996 | err = 0; | 997 | err = 0; |
997 | clnt = kmalloc(sizeof(struct p9_client), GFP_KERNEL); | 998 | clnt = kmalloc(sizeof(struct p9_client), GFP_KERNEL); |
@@ -1000,6 +1001,10 @@ struct p9_client *p9_client_create(const char *dev_name, char *options) | |||
1000 | 1001 | ||
1001 | clnt->trans_mod = NULL; | 1002 | clnt->trans_mod = NULL; |
1002 | clnt->trans = NULL; | 1003 | clnt->trans = NULL; |
1004 | |||
1005 | client_id = utsname()->nodename; | ||
1006 | memcpy(clnt->name, client_id, strlen(client_id) + 1); | ||
1007 | |||
1003 | spin_lock_init(&clnt->lock); | 1008 | spin_lock_init(&clnt->lock); |
1004 | INIT_LIST_HEAD(&clnt->fidlist); | 1009 | INIT_LIST_HEAD(&clnt->fidlist); |
1005 | 1010 | ||