Attachment 149372 Details for Bug 229780 – patch -- don't free NULL pointer on error, also dont leak iostats

[patch] patch -- don't free NULL pointer on error, also dont leak iostats

linux-2.6.9-free-iostats-cleanup.patch (text/plain), 1.50 KB, created by Jeff Layton on 2007-03-06 19:46:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-03-06 19:46:00 UTC

Size: 1.50 KB

patch

obsolete

>From: Jeff Layton <jlayton@redhat.com>
>To: rhkernel-list@redhat.com
>Cc: staubach@redhat.com, steved@redhat.com
>Subject: Re: [RHEL4.5 PATCH] fix panic in nfs4_get_sb (BZ 229780)
>
>I think I had misunderstood Peter's last email about this patch. Now that I
>look closer, I agree that we don't need to make any changes to nfs_sb_init.
>Here's a respun patch that removes that piece. I did a brief test and it
>fixes the original problem.
>
>diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
>index 2fecd90..fcc69c1 100644
>--- a/fs/nfs/inode.c
>+++ b/fs/nfs/inode.c
>@@ -1701,6 +1701,7 @@ static void nfs_kill_super(struct super_block *s)
> 
> 	rpciod_down();		/* release rpciod */
> 
>+	nfs_free_iostats(server->io_stats);
> 	if (server->hostname != NULL)
> 		kfree(server->hostname);
> 	kfree(server);
>@@ -2022,7 +2023,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 +2042,7 @@ static void nfs4_kill_super(struct super_block *sb)
> 
> 	destroy_nfsv4_state(server);
> 
>+	nfs_free_iostats(server->io_stats);
> 	if (server->hostname != NULL)
> 		kfree(server->hostname);
> 	kfree(server);
>diff --git a/fs/nfs/iostat.h b/fs/nfs/iostat.h
>index dc080e5..28fe40a 100644
>--- a/fs/nfs/iostat.h
>+++ b/fs/nfs/iostat.h
>@@ -145,7 +145,8 @@ static inline struct nfs_iostats *nfs_alloc_iostats(void)
> 
> 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