Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261309AbVESXWX (ORCPT ); Thu, 19 May 2005 19:22:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261295AbVESXUz (ORCPT ); Thu, 19 May 2005 19:20:55 -0400 Received: from parcelfarce.linux.theplanet.co.uk ([195.92.249.252]:58530 "EHLO parcelfarce.linux.theplanet.co.uk") by vger.kernel.org with ESMTP id S261309AbVESW44 (ORCPT ); Thu, 19 May 2005 18:56:56 -0400 To: linux-kernel@vger.kernel.org Subject: [CFR][PATCH] namei fixes (16/19) Cc: akpm@osdl.org Message-Id: From: Al Viro Date: Thu, 19 May 2005 23:57:21 +0100 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1363 Lines: 44 (16/19) Conditional mntput() moved into __do_follow_link(). There it collapses with unconditional mntget() on the same sucker, closing another too-early-mntput() race. Signed-off-by: Al Viro ---- diff -urN RC12-rc4-15/fs/namei.c RC12-rc4-16/fs/namei.c --- RC12-rc4-15/fs/namei.c 2005-05-19 16:39:44.743587923 -0400 +++ RC12-rc4-16/fs/namei.c 2005-05-19 16:39:45.837369971 -0400 @@ -506,7 +506,8 @@ touch_atime(nd->mnt, dentry); nd_set_link(nd, NULL); - mntget(path->mnt); + if (path->mnt == nd->mnt) + mntget(path->mnt); error = dentry->d_inode->i_op->follow_link(dentry, nd); if (!error) { char *s = nd_get_link(nd); @@ -543,8 +544,6 @@ current->link_count++; current->total_link_count++; nd->depth++; - if (path->mnt != nd->mnt) - mntput(path->mnt); err = __do_follow_link(path, nd); current->link_count--; nd->depth--; @@ -1550,8 +1549,6 @@ error = security_inode_follow_link(path.dentry, nd); if (error) goto exit_dput; - if (nd->mnt != path.mnt) - mntput(path.mnt); error = __do_follow_link(&path, nd); if (error) return error; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/