tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

Pull fuse fixes from Miklos Szeredi:
"Two bugfixes, both bound for -stable"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: break infinite loop in fuse_fill_write_pages()
cuse: fix memory leak

Linus Torvalds 732c4a9e 4be460d9

+3 -1
+2
fs/fuse/cuse.c
··· 549 549 unregister_chrdev_region(cc->cdev->dev, 1); 550 550 cdev_del(cc->cdev); 551 551 } 552 + /* Base reference is now owned by "fud" */ 553 + fuse_conn_put(&cc->fc); 552 554 553 555 rc = fuse_dev_release(inode, file); /* puts the base reference */ 554 556
+1 -1
fs/fuse/file.c
··· 1049 1049 tmp = iov_iter_copy_from_user_atomic(page, ii, offset, bytes); 1050 1050 flush_dcache_page(page); 1051 1051 1052 + iov_iter_advance(ii, tmp); 1052 1053 if (!tmp) { 1053 1054 unlock_page(page); 1054 1055 page_cache_release(page); ··· 1062 1061 req->page_descs[req->num_pages].length = tmp; 1063 1062 req->num_pages++; 1064 1063 1065 - iov_iter_advance(ii, tmp); 1066 1064 count += tmp; 1067 1065 pos += tmp; 1068 1066 offset += tmp;