On Fri, 15 June 2007 12:59:27 +0400, Evgeniy Polyakov wrote:
> On Sun, Jun 03, 2007 at 08:44:29PM +0200, Jörn Engel (joern@xxxxxxxxxxxxxxx) wrote:
> > --- /dev/null 2007-03-13 19:15:28.862769062 +0100
> > +++ linux-2.6.21logfs/fs/logfs/dir.c 2007-06-03 19:54:55.000000000 +0200
>
> ...
>
> > +static int __logfs_dir_walk(struct inode *dir, struct dentry *dentry,
> > + dir_callback handler, struct logfs_disk_dentry *dd, loff_t *pos)
> > +{
> > + struct qstr *name = dentry ? &dentry->d_name : NULL;
> > + int ret;
> > +
> > + for (; ; (*pos)++) {
> > + ret = read_dir(dir, dd, *pos);
> > + if (ret == -EOF)
> > + return 0;
> > + if (ret == -ENODATA) {
> > + /* deleted dentry */
> > + *pos = dir_seek_data(dir, *pos);
> > + continue;
> > + }
> > + if (ret)
> > + return ret;
> > + BUG_ON(dd->namelen == 0);
>
> This can be moved out of the loop or even to the higher layer where this
> one is called.
> There is number of such debug stuff in the tree.
I am not sure here. What is definitely needed is crc protection for
dentries and inodes. Those 4 bytes are well-spent.
With crc protection, there are only two reasons why dd->namelen would
ever be zero. One is a maliciously prepared image, the other a bug when
writing the dentry.
Maybe I should do something like this:
ret = logfs_data_check(dd->namelen == 0);
if (ret)
return ret;
And in some header:
static inline int logfs_data_check(int cond)
{
#ifdef CONFIG_LOGFS_EXTRA_DATA_CHECKS
if (unlikely(cond))
return -EIO;
#endif
return 0;
}
Then the user can decide whether crc checks are sufficient or not.
> > +static int logfs_lookup_handler(struct inode *dir, struct dentry *dentry,
> > + struct logfs_disk_dentry *dd, loff_t pos)
> > +{
> > + struct inode *inode;
> > +
> > + inode = iget(dir->i_sb, be64_to_cpu(dd->ino));
> > + if (!inode)
> > + return -EIO;
> > + return PTR_ERR(d_splice_alias(inode, dentry));
> > +}
>
> From perfectionism point of view it should return long not int, but
> frankly it is so minor, that even does not costs time I spent writing
> this sentence. ^W^W^W
Then let me change it before more time is wasted on it.
> > +static int __logfs_readdir(struct file *file, void *buf, filldir_t filldir)
> > +{
> > + struct logfs_disk_dentry dd;
> > + struct inode *dir = file->f_dentry->d_inode;
> > + loff_t pos = file->f_pos - IMPLICIT_NODES;
> > + int err;
> > +
> > + BUG_ON(pos<0);
>
> Spaces run away.
Yep.
> > +static void logfs_set_name(struct logfs_disk_dentry *dd, struct qstr *name)
> > +{
> > + BUG_ON(name->len > LOGFS_MAX_NAMELEN);
>
> Hmmm, I would write here that user is damn wrong and his
> DNA is not interested for the humanity gene pool instead of crashing
> machine.
Moral considerations aside, I don't see how LogFS could remove user DNA
from the gene pool. What I could remove is the BUG_ON.
> > + dd->namelen = cpu_to_be16(name->len);
> > + memcpy(dd->name, name->name, name->len);
> > +}
> > +}
>
> > +static int logfs_symlink(struct inode *dir, struct dentry *dentry,
> > + const char *target)
> > +{
> > + struct inode *inode;
> > + size_t destlen = strlen(target) + 1;
> > +
> > + if (destlen > dir->i_sb->s_blocksize)
> > + return -ENAMETOOLONG;
>
> Should it also include related to name overhead, or name is just placed
> into datablock as is?
This is indeed crap. While the format may cope with blocksize dentries,
the code puts them on the kernel stack and would suffer accordingly.
That should be LOGFS_MAX_NAMELEN, as it once used to be.
> > +static int logfs_delete_dd(struct inode *dir, struct logfs_disk_dentry *dd,
> > + loff_t pos)
> > +{
> > + int err;
> > +
> > + err = read_dir(dir, dd, pos);
> > +
> > + /*
> > + * Getting called with pos somewhere beyond eof is either a goofup
> > + * within this file or means someone maliciously edited the
> > + * (crc-protected) journal.
> > + */
> > + LOGFS_BUG_ON(err == -EOF, dir->i_sb);
>
> Maybe just return permanent error, remount itself read-only
> and say something insulting instead of killing itself in pain?
Yes. I should have a version of LOGFS_BUG_ON() without the actual BUG()
and a slightly less threatening name.
> > +static int logfs_rename_target(struct inode *old_dir, struct dentry *old_dentry,
> > + struct inode *new_dir, struct dentry *new_dentry)
> > +{
> > + struct logfs_super *super = logfs_super(old_dir->i_sb);
> > + struct inode *old_inode = old_dentry->d_inode;
> > + struct inode *new_inode = new_dentry->d_inode;
> > + int isdir = S_ISDIR(old_inode->i_mode);
> > + struct logfs_disk_dentry dd;
> > + loff_t pos;
> > + int err;
> > +
> > + BUG_ON(isdir != S_ISDIR(new_inode->i_mode));
>
> Spaces run away.
Where?
> > + if (isdir) {
> > + if (!logfs_empty_dir(new_inode))
> > + return -ENOTEMPTY;
> > + }
>
> One can save two lines of code if put both logical chek in on if ().
Fair enough.
> > +int logfs_replay_journal(struct super_block *sb)
> > +{
> > + struct logfs_super *super = logfs_super(sb);
> > + struct logfs_disk_dentry dd;
> > + struct inode *inode;
> > + u64 ino, pos;
> > + int err;
> > +
> > + if (super->s_victim_ino) {
> > + /* delete victim inode */
> > + ino = super->s_victim_ino;
> > + inode = iget(sb, ino);
> > + if (!inode)
> > + goto fail;
> > +
> > + super->s_victim_ino = 0;
> > + err = logfs_remove_inode(inode);
> > + iput(inode);
> > + if (err) {
> > + super->s_victim_ino = ino;
> > + goto fail;
> > + }
> > + }
> > + if (super->s_rename_dir) {
> > + /* delete old dd from rename */
> > + ino = super->s_rename_dir;
> > + pos = super->s_rename_pos;
> > + inode = iget(sb, ino);
> > + if (!inode)
> > + goto fail;
> > +
> > + super->s_rename_dir = 0;
> > + super->s_rename_pos = 0;
> > + err = logfs_delete_dd(inode, &dd, pos);
> > + iput(inode);
> > + if (err) {
> > + super->s_rename_dir = ino;
> > + super->s_rename_pos = pos;
> > + goto fail;
> > + }
> > + }
> > + return 0;
> > +fail:
> > + LOGFS_BUG(sb);
> > + return -EIO;
>
> :)
Are your thinking something insulting behind that smile? ;)
Yep, same as above.
Jörn
--
Everything should be made as simple as possible, but not simpler.
-- Albert Einstein
-
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
