Attachment 313698 Details for Bug 454942 – patch to fix the problem.

[patch] patch to fix the problem.

ext3-no-panic-corrupt-dirents.patch (text/plain), 1.80 KB, created by Josef Bacik on 2008-08-07 14:47:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Bacik

Created: 2008-08-07 14:47:24 UTC

Size: 1.80 KB

patch

obsolete

>Index: rhel5-kernel/fs/ext3/namei.c
>===================================================================
>--- rhel5-kernel.orig/fs/ext3/namei.c
>+++ rhel5-kernel/fs/ext3/namei.c
>@@ -380,13 +380,27 @@ dx_probe(struct dentry *dentry, struct i
> 
> 	entries = (struct dx_entry *) (((char *)&root->info) +
> 				       root->info.info_length);
>-	assert(dx_get_limit(entries) == dx_root_limit(dir,
>-						      root->info.info_length));
>+	if (dx_get_limit(entries) != dx_root_limit(dir,
>+						   root->info.info_length)) {
>+		ext3_warning(dir->i_sb, __FUNCTION__,
>+			     "dx entry: limit != root limit");
>+		brelse(bh);
>+		*err = ERR_BAD_DX_DIR;
>+		goto fail;
>+	}
>+
> 	dxtrace (printk("Look up %x", hash));
> 	while (1)
> 	{
> 		count = dx_get_count(entries);
>-		assert (count && count <= dx_get_limit(entries));
>+		if (!count || count > dx_get_limit(entries)) {
>+			ext3_warning(dir->i_sb, __FUNCTION__,
>+				     "dx entry: no count or count > limit");
>+			brelse(bh);
>+			*err = ERR_BAD_DX_DIR;
>+			goto fail2;
>+		}
>+
> 		p = entries + 1;
> 		q = entries + count - 1;
> 		while (p <= q)
>@@ -424,8 +438,15 @@ dx_probe(struct dentry *dentry, struct i
> 		if (!(bh = ext3_bread (NULL,dir, dx_get_block(at), 0, err)))
> 			goto fail2;
> 		at = entries = ((struct dx_node *) bh->b_data)->entries;
>-		assert (dx_get_limit(entries) == dx_node_limit (dir));
>+		if (dx_get_limit(entries) != dx_node_limit(dir)) {
>+			ext3_warning(dir->i_sb, __FUNCTION__,
>+				     "dx entry: limit != node limit");
>+			brelse(bh);
>+			*err = ERR_BAD_DX_DIR;
>+			goto fail2;
>+		}
> 		frame++;
>+		frame->bh = NULL;
> 	}
> fail2:
> 	while (frame >= frame_in) {
>@@ -433,6 +454,10 @@ fail2:
> 		frame--;
> 	}
> fail:
>+	if (*err == ERR_BAD_DX_DIR)
>+		ext3_warning(dir->i_sb, __FUNCTION__,
>+			     "Corrupt dir inode %ld, running e2fsck is "
>+			     "recommended.", dir->i_ino);
> 	return NULL;
> }
>

Actions: View | Diff

Attachments on bug 454942: 311520 | 313698