linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] [CIFS] fix inode leak in cifs_get_inode_info_unix
@ 2008-07-02  9:57 Jeff Layton
  2008-07-12  0:50 ` Andrew Morton
  0 siblings, 1 reply; 2+ messages in thread
From: Jeff Layton @ 2008-07-02  9:57 UTC (permalink / raw)
  To: smfrench; +Cc: linux-fsdevel, linux-cifs-client, niallain, linux-kernel

Try this:

    mount a share with unix extensions
    create a file on it
    umount the share

You'll get the following message in the ring buffer:

VFS: Busy inodes after unmount of cifs. Self-destruct in 5 seconds.  Have a
nice day...

...the problem is that cifs_get_inode_info_unix is creating and hashing
a new inode even when it's going to return error anyway. The first
lookup when creating a file returns an error so we end up leaking this
inode before we do the actual create. This appears to be a regression
caused by commit 0e4bbde94fdc33f5b3d793166b21bf768ca3e098.

The following patch seems to fix it for me, and fixes a minor
formatting nit as well.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

 fs/cifs/inode.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 722be54..2e904bd 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -219,15 +219,15 @@ int cifs_get_inode_info_unix(struct inode **pinode,
 	rc = CIFSSMBUnixQPathInfo(xid, pTcon, full_path, &find_data,
 				  cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
 					CIFS_MOUNT_MAP_SPECIAL_CHR);
-	if (rc) {
-		if (rc == -EREMOTE && !is_dfs_referral) {
-			is_dfs_referral = true;
-			cFYI(DBG2, ("DFS ref"));
-			/* for DFS, server does not give us real inode data */
-			fill_fake_finddataunix(&find_data, sb);
-			rc = 0;
-		}
-	}
+	if (rc == -EREMOTE && !is_dfs_referral) {
+		is_dfs_referral = true;
+		cFYI(DBG2, ("DFS ref"));
+		/* for DFS, server does not give us real inode data */
+		fill_fake_finddataunix(&find_data, sb);
+		rc = 0;
+	} else if (rc)
+		goto cgiiu_exit;
+
 	num_of_bytes = le64_to_cpu(find_data.NumOfBytes);
 	end_of_file = le64_to_cpu(find_data.EndOfFile);
 
@@ -236,7 +236,7 @@ int cifs_get_inode_info_unix(struct inode **pinode,
 		*pinode = new_inode(sb);
 		if (*pinode == NULL) {
 			rc = -ENOMEM;
-		goto cgiiu_exit;
+			goto cgiiu_exit;
 		}
 		/* Is an i_ino of zero legal? */
 		/* note ino incremented to unique num in new_inode */

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] [CIFS] fix inode leak in cifs_get_inode_info_unix
  2008-07-02  9:57 [PATCH] [CIFS] fix inode leak in cifs_get_inode_info_unix Jeff Layton
@ 2008-07-12  0:50 ` Andrew Morton
  0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2008-07-12  0:50 UTC (permalink / raw)
  To: Jeff Layton
  Cc: smfrench, niallain, linux-cifs-client, linux-fsdevel,
	linux-kernel, Rafael J. Wysocki

On Wed, 02 Jul 2008 05:57:38 -0400 Jeff Layton <jlayton@redhat.com> wrote:

> Date: 	Wed, 02 Jul 2008 05:57:38 -0400

hm, nine days and afaict this post-2.6.25 regression remains unfixed?

> Sender: linux-kernel-owner@vger.kernel.org
> User-Agent: StGIT/0.14.2
> 
> Try this:
> 
>     mount a share with unix extensions
>     create a file on it
>     umount the share
> 
> You'll get the following message in the ring buffer:
> 
> VFS: Busy inodes after unmount of cifs. Self-destruct in 5 seconds.  Have a
> nice day...
> 
> ...the problem is that cifs_get_inode_info_unix is creating and hashing
> a new inode even when it's going to return error anyway. The first
> lookup when creating a file returns an error so we end up leaking this
> inode before we do the actual create. This appears to be a regression
> caused by commit 0e4bbde94fdc33f5b3d793166b21bf768ca3e098.
> 
> The following patch seems to fix it for me, and fixes a minor
> formatting nit as well.
> 
> Signed-off-by: Jeff Layton <jlayton@redhat.com>

So it's probably too late to get this into 2.6.26.  I'll merge it with
a cc:stable and hopefully 2.6.26.1 will not have this bug.

I'll give "fix wksidarr declaration to be big-endian friendly" the same
treatment.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-07-12  0:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-02  9:57 [PATCH] [CIFS] fix inode leak in cifs_get_inode_info_unix Jeff Layton
2008-07-12  0:50 ` Andrew Morton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).