Attachment 148838 Details for Bug 229780 – updated patch -- remove added nfs_free_iostats that would have caused double-free

[patch] updated patch -- remove added nfs_free_iostats that would have caused double-free

linux-2.6.9-nfs4fillsuper-oops.patch (text/plain), 1.97 KB, created by Jeff Layton on 2007-02-26 23:03:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-02-26 23:03:35 UTC

Size: 1.97 KB

patch

obsolete

>From: Jeff Layton <jlayton@redhat.com>
>To: rhkernel-list@redhat.com
>Subject: Re: [RHEL4.5 PATCH] fix panic in nfs4_get_sb (BZ 229780)
>
>> I think that the changes to nfs_sb_init() are not required.
>> 
>> Or am I missing something?
>
>Nope, you are indeed correct. How about this patch instead? Same as the
>other one, but without the added nfs_free_iostats.
>
>--- linux-2.6.9/fs/nfs/inode.c.~1~
>+++ linux-2.6.9/fs/nfs/inode.c
>@@ -275,6 +275,10 @@ nfs_sb_init(struct super_block *sb, rpc_
> 
> 	sb->s_magic      = NFS_SUPER_MAGIC;
> 
>+	server->io_stats = nfs_alloc_iostats();
>+	if (server->io_stats == NULL)
>+		return -ENOMEM;
>+
> 	root_inode = nfs_get_root(sb, &server->fh, &fsinfo);
> 	/* Did getting the root inode fail? */
> 	if (IS_ERR(root_inode)) {
>@@ -288,12 +292,6 @@ nfs_sb_init(struct super_block *sb, rpc_
> 	}
> 	sb->s_root->d_op = server->rpc_ops->dentry_ops;
> 
>-	server->io_stats = nfs_alloc_iostats();
>-	if (!server->io_stats) {
>-		no_root_error = -ENOMEM;
>-		goto out_no_root;
>-	}
>-
> 	/* Get some general file system info */
> 	if (server->namelen == 0 &&
> 	    server->rpc_ops->pathconf(server, &server->fh, &pathinfo) >= 0)
>@@ -1701,6 +1699,7 @@ static void nfs_kill_super(struct super_
> 
> 	rpciod_down();		/* release rpciod */
> 
>+	nfs_free_iostats(server->io_stats);
> 	if (server->hostname != NULL)
> 		kfree(server->hostname);
> 	kfree(server);
>@@ -2022,7 +2021,6 @@ out_free:
> 		kfree(server->mnt_path);
> 	if (server->hostname)
> 		kfree(server->hostname);
>-	nfs_free_iostats(server->io_stats);
> 	kfree(server);
> 	return s;
> }
>@@ -2042,6 +2040,7 @@ static void nfs4_kill_super(struct super
> 
> 	destroy_nfsv4_state(server);
> 
>+	nfs_free_iostats(server->io_stats);
> 	if (server->hostname != NULL)
> 		kfree(server->hostname);
> 	kfree(server);
>--- linux-2.6.9/fs/nfs/iostat.h.~1~
>+++ linux-2.6.9/fs/nfs/iostat.h
>@@ -145,7 +145,8 @@ static inline struct nfs_iostats *nfs_al
> 
> static inline void nfs_free_iostats(struct nfs_iostats *stats)
> {
>-	free_percpu(stats);
>+	if (stats != NULL)
>+		free_percpu(stats);
> }
> 
> #endif

Actions: View | Diff

Attachments on bug 229780: 148684 | 148816 | 148838 | 149372