diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 12:34:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 12:34:13 -0700 |
| commit | 2b76db6a0f649f5a54805807d36d51b6e9e49089 (patch) | |
| tree | 1155e363d3ea5e416ac5627402dd862028db6907 /net/9p/client.c | |
| parent | 53bf710832a7191e023e2bb1e333226e3115cfa0 (diff) | |
| parent | 50192abe02929586111fb33f216060a9341875f1 (diff) | |
| download | linux-stable-2b76db6a0f649f5a54805807d36d51b6e9e49089.tar.gz linux-stable-2b76db6a0f649f5a54805807d36d51b6e9e49089.tar.bz2 linux-stable-2b76db6a0f649f5a54805807d36d51b6e9e49089.zip | |
Merge tag 'for-linus-3.12-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull 9p updates from Eric Van Hensbergen:
"Minor 9p fixes and tweaks for 3.12 merge window
The first fixes namespace issues which causes a kernel NULL pointer
dereference, the second fixes uevent handling to work better with
udev, and the third switches some code to use srlcpy instead of
strncpy in order to be safer.
All changes have been baking in for-next for at least 2 weeks"
* tag 'for-linus-3.12-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
fs/9p: avoid accessing utsname after namespace has been torn down
9p: send uevent after adding/removing mount_tag attribute
fs: 9p: use strlcpy instead of strncpy
Diffstat (limited to 'net/9p/client.c')
| -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 ba93bdab2701..ee8fd6bd4035 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -987,6 +987,7 @@ struct p9_client *p9_client_create(const char *dev_name, char *options) { int err; struct p9_client *clnt; + char *client_id; err = 0; clnt = kmalloc(sizeof(struct p9_client), GFP_KERNEL); @@ -995,6 +996,10 @@ struct p9_client *p9_client_create(const char *dev_name, char *options) clnt->trans_mod = NULL; clnt->trans = NULL; + + client_id = utsname()->nodename; + memcpy(clnt->name, client_id, strlen(client_id) + 1); + spin_lock_init(&clnt->lock); INIT_LIST_HEAD(&clnt->fidlist); |