Attachment 144912 Details for Bug 217008 – Proposed fix

[patch] Proposed fix

fuzzer_fix (text/plain), 1.38 KB, created by Russell Cattelan on 2007-01-05 16:28:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Russell Cattelan

Created: 2007-01-05 16:28:22 UTC

Size: 1.38 KB

patch

obsolete

>Change gfs2_lookupi to either return an inode or an error.
>None of the callers of gfs2_lookupi expect a NULL on error
>and such would end up dereferencing all NULL ptr.
>
>This fixes:
>http://projects.info-pull.com/mokb/MOKB-15-11-2006.html
>
>Signed-off-by: Russell Cattelan <cattelan@xfs.org>
>Index: gfs2_work/fs/gfs2/inode.c
>===================================================================
>--- gfs2_work.orig/fs/gfs2/inode.c	2007-01-04 19:43:11.710338114 -0600
>+++ gfs2_work/fs/gfs2/inode.c	2007-01-04 19:43:32.258585565 -0600
>@@ -419,7 +419,7 @@ struct inode *gfs2_lookupi(struct inode 
> out:
> 	gfs2_glock_dq_uninit(&d_gh);
> 	if (error == -ENOENT)
>-		return NULL;
>+		return ERR_PTR(error);
> 	return inode;
> }
> 
>Index: gfs2_work/fs/gfs2/ops_export.c
>===================================================================
>--- gfs2_work.orig/fs/gfs2/ops_export.c	2006-12-19 20:05:01.000000000 -0600
>+++ gfs2_work/fs/gfs2/ops_export.c	2007-01-04 19:51:20.708282759 -0600
>@@ -174,13 +174,11 @@ static struct dentry *gfs2_get_parent(st
> 	gfs2_str2qstr(&dotdot, "..");
> 	inode = gfs2_lookupi(child->d_inode, &dotdot, 1, NULL);
> 
>-	if (!inode)
>-		return ERR_PTR(-ENOENT);
> 	/*
> 	 * In case of an error, @inode carries the error value, and we
> 	 * have to return that as a(n invalid) pointer to dentry.
> 	 */
>-	if (IS_ERR(inode))
>+	if (inode && IS_ERR(inode))
> 		return ERR_PTR(PTR_ERR(inode));
> 
> 	dentry = d_alloc_anon(inode);

Actions: View | Diff

Attachments on bug 217008: 144912 | 144947