diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-29 14:41:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-29 14:41:09 -0700 |
commit | 7376e39ad96583545faefa2e7798bcb6a2a212a7 (patch) | |
tree | 09842932712f06a21a7f1bdd83fa6fbfabc79d70 /fs | |
parent | c6503f12d135a616b25be99a492765fc9e9fe07e (diff) | |
parent | daf5cc27eed99afdea8d96e71b89ba41f5406ef6 (diff) | |
download | linux-stable-7376e39ad96583545faefa2e7798bcb6a2a212a7.tar.gz linux-stable-7376e39ad96583545faefa2e7798bcb6a2a212a7.tar.bz2 linux-stable-7376e39ad96583545faefa2e7798bcb6a2a212a7.zip |
Merge tag 'ceph-for-5.1-rc3' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"A patch to avoid choking on multipage bvecs in the messenger and a
small use-after-free fix"
* tag 'ceph-for-5.1-rc3' of git://github.com/ceph/ceph-client:
ceph: fix use-after-free on symlink traversal
libceph: fix breakage caused by multipage bvecs
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ceph/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index e3346628efe2..2d61ddda9bf5 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -524,6 +524,7 @@ static void ceph_i_callback(struct rcu_head *head) struct inode *inode = container_of(head, struct inode, i_rcu); struct ceph_inode_info *ci = ceph_inode(inode); + kfree(ci->i_symlink); kmem_cache_free(ceph_inode_cachep, ci); } @@ -566,7 +567,6 @@ void ceph_destroy_inode(struct inode *inode) } } - kfree(ci->i_symlink); while ((n = rb_first(&ci->i_fragtree)) != NULL) { frag = rb_entry(n, struct ceph_inode_frag, node); rb_erase(n, &ci->i_fragtree); |