Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185087
b: refs/heads/master
c: b2d82ee
h: refs/heads/master
i:
  185085: 4fa3bc7
  185083: a713f60
  185079: c0f1b4b
  185071: fbb6368
  185055: 6d8b207
  185023: dc5911e
  184959: aa4074a
  184831: 7d72d5c
v: v3
  • Loading branch information
Fang Wenqi authored and Miklos Szeredi committed Feb 5, 2010
1 parent d56ff8a commit 24d08d0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b21dda438baa450a76a375a35653ae0377793fab
refs/heads/master: b2d82ee3c8b2193ee5bc7eca4687ee9be30abd34
11 changes: 9 additions & 2 deletions trunk/fs/fuse/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -881,10 +881,15 @@ static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size,
struct fuse_copy_state *cs)
{
struct fuse_notify_inval_entry_out outarg;
int err = -EINVAL;
char buf[FUSE_NAME_MAX+1];
int err = -ENOMEM;
char *buf;
struct qstr name;

buf = kzalloc(FUSE_NAME_MAX + 1, GFP_KERNEL);
if (!buf)
goto err;

err = -EINVAL;
if (size < sizeof(outarg))
goto err;

Expand All @@ -910,9 +915,11 @@ static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size,
if (fc->sb)
err = fuse_reverse_inval_entry(fc->sb, outarg.parent, &name);
up_read(&fc->killsb);
kfree(buf);
return err;

err:
kfree(buf);
fuse_copy_finish(cs);
return err;
}
Expand Down

0 comments on commit 24d08d0

Please sign in to comment.