diff options
| author | Colin Cross <ccross@android.com> | 2011-10-27 15:01:19 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-10-27 15:01:19 -0700 |
| commit | 2bb3e310159b65c88caf0c67a20ed257568be267 (patch) | |
| tree | e4ad01c06a9e27939781c5dd9d0cb92e6fcd54d5 /fs/fuse | |
| parent | 2f53cb72c1574d3880d9e88e254b756565fe2f6d (diff) | |
| parent | 97596c34030ed28657ccafddb67e17a03890b90a (diff) | |
| download | kernel_samsung_aries-2bb3e310159b65c88caf0c67a20ed257568be267.zip kernel_samsung_aries-2bb3e310159b65c88caf0c67a20ed257568be267.tar.gz kernel_samsung_aries-2bb3e310159b65c88caf0c67a20ed257568be267.tar.bz2 | |
Merge commit 'v3.0.8' into android-3.0
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/dev.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 99e1334..fb6fc95 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -259,10 +259,14 @@ void fuse_queue_forget(struct fuse_conn *fc, struct fuse_forget_link *forget, forget->forget_one.nlookup = nlookup; spin_lock(&fc->lock); - fc->forget_list_tail->next = forget; - fc->forget_list_tail = forget; - wake_up(&fc->waitq); - kill_fasync(&fc->fasync, SIGIO, POLL_IN); + if (fc->connected) { + fc->forget_list_tail->next = forget; + fc->forget_list_tail = forget; + wake_up(&fc->waitq); + kill_fasync(&fc->fasync, SIGIO, POLL_IN); + } else { + kfree(forget); + } spin_unlock(&fc->lock); } @@ -1362,6 +1366,10 @@ static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size, if (outarg.namelen > FUSE_NAME_MAX) goto err; + err = -EINVAL; + if (size != sizeof(outarg) + outarg.namelen + 1) + goto err; + name.name = buf; name.len = outarg.namelen; err = fuse_copy_one(cs, buf, outarg.namelen + 1); |