projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] fs: fix libfs data leak
[deliverable/linux.git]
/
fs
/
libfs.c
diff --git
a/fs/libfs.c
b/fs/libfs.c
index 503898d5c4a748226e2f17e2cd9c8ab4ee081b87..cf79196535ec5fc277f2dc9f190a3cc7e551dcd6 100644
(file)
--- a/
fs/libfs.c
+++ b/
fs/libfs.c
@@
-186,7
+186,7
@@
const struct file_operations simple_dir_operations = {
.fsync = simple_sync_file,
};
.fsync = simple_sync_file,
};
-struct inode_operations simple_dir_inode_operations = {
+
const
struct inode_operations simple_dir_inode_operations = {
.lookup = simple_lookup,
};
.lookup = simple_lookup,
};
@@
-195,11
+195,11
@@
struct inode_operations simple_dir_inode_operations = {
* will never be mountable)
*/
int get_sb_pseudo(struct file_system_type *fs_type, char *name,
* will never be mountable)
*/
int get_sb_pseudo(struct file_system_type *fs_type, char *name,
- struct super_operations *ops, unsigned long magic,
+
const
struct super_operations *ops, unsigned long magic,
struct vfsmount *mnt)
{
struct super_block *s = sget(fs_type, NULL, set_anon_super, NULL);
struct vfsmount *mnt)
{
struct super_block *s = sget(fs_type, NULL, set_anon_super, NULL);
- static struct super_operations default_ops = {.statfs = simple_statfs};
+ static
const
struct super_operations default_ops = {.statfs = simple_statfs};
struct dentry *dentry;
struct inode *root;
struct qstr d_name = {.name = name, .len = strlen(name)};
struct dentry *dentry;
struct inode *root;
struct qstr d_name = {.name = name, .len = strlen(name)};
@@
-335,17
+335,18
@@
int simple_prepare_write(struct file *file, struct page *page,
flush_dcache_page(page);
kunmap_atomic(kaddr, KM_USER0);
}
flush_dcache_page(page);
kunmap_atomic(kaddr, KM_USER0);
}
- SetPageUptodate(page);
}
return 0;
}
int simple_commit_write(struct file *file, struct page *page,
}
return 0;
}
int simple_commit_write(struct file *file, struct page *page,
- unsigned
offset
, unsigned to)
+ unsigned
from
, unsigned to)
{
struct inode *inode = page->mapping->host;
loff_t pos = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
{
struct inode *inode = page->mapping->host;
loff_t pos = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
+ if (!PageUptodate(page))
+ SetPageUptodate(page);
/*
* No need to use i_size_read() here, the i_size
* cannot change under us because we hold the i_mutex.
/*
* No need to use i_size_read() here, the i_size
* cannot change under us because we hold the i_mutex.
This page took
0.02616 seconds
and
5
git commands to generate.