Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=ab8b0e0ba2f... Commit: ab8b0e0ba2fff7585a386673ff378f3cdc992063 Parent: 820f78aa19af31c25d1bcfd1d21de134026a56db Author: Bob Peterson rpeterso@redhat.com AuthorDate: Tue Nov 11 14:40:39 2014 -0600 Committer: Bob Peterson rpeterso@redhat.com CommitterDate: Fri Jan 9 13:09:58 2015 -0600
fsck.gfs2: Change basic dentry checks for too long of file names
This patch adds a check to the basic dentry check such that it will reject any dirents that have a file name more than the maximum allowed. --- gfs2/fsck/pass2.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c index 1559d8e..bdcf77c 100644 --- a/gfs2/fsck/pass2.c +++ b/gfs2/fsck/pass2.c @@ -468,7 +468,8 @@ static int basic_dentry_checks(struct gfs2_inode *ip, struct gfs2_dirent *dent, } }
- if (de->de_rec_len < GFS2_DIRENT_SIZE(de->de_name_len)) { + if (de->de_rec_len < GFS2_DIRENT_SIZE(de->de_name_len) || + de->de_name_len > GFS2_FNAMESIZE) { log_err( _("Dir entry with bad record or name length\n" "\tRecord length = %u\n\tName length = %u\n"), de->de_rec_len, de->de_name_len); @@ -476,9 +477,12 @@ static int basic_dentry_checks(struct gfs2_inode *ip, struct gfs2_dirent *dent, log_err( _("Directory entry not fixed.\n")); return 0; } + /* Don't be tempted to do this: fsck_blockmap_set(ip, ip->i_di.di_num.no_addr, _("corrupt directory entry"), gfs2_inode_invalid); + We can't free it because another dir may have a valid reference + to it. Just return 1 so we can delete the bad dirent. */ log_err( _("Bad directory entry deleted.\n")); return 1; }
cluster-commits@lists.fedorahosted.org