From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v7 27/49] vfs: fix symlinkat to retry on ESTALE errors Date: Mon, 1 Oct 2012 20:16:36 -0400 Message-ID: <1349137018-21948-28-git-send-email-jlayton@redhat.com> References: <1349137018-21948-1-git-send-email-jlayton@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.18]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q920HipM028675 for ; Mon, 1 Oct 2012 20:17:45 -0400 Received: from mail-yx0-f174.google.com (mail-yx0-f174.google.com [209.85.213.174]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q920H6tJ018698 for ; Mon, 1 Oct 2012 20:17:44 -0400 Received: by mail-yx0-f174.google.com with SMTP id m12so1534914yen.33 for ; Mon, 01 Oct 2012 17:17:44 -0700 (PDT) In-Reply-To: <1349137018-21948-1-git-send-email-jlayton@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-audit@redhat.com, linux-kernel@vger.kernel.org List-Id: linux-audit@redhat.com Signed-off-by: Jeff Layton --- fs/namei.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index dd1d519..fb9d36f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3528,21 +3528,25 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname, struct getname_info *from; struct dentry *dentry; struct path path; + unsigned int try = 0; from = getname(oldname); if (IS_ERR(from)) return PTR_ERR(from); - dentry = user_path_create(newdfd, newname, &path, false, false); - error = PTR_ERR(dentry); - if (IS_ERR(dentry)) - goto out_putname; + do { + dentry = user_path_create(newdfd, newname, &path, false, false); + if (IS_ERR(dentry)) { + error = PTR_ERR(dentry); + break; + } - error = security_path_symlink(&path, dentry, from->name); - if (!error) - error = vfs_symlink(path.dentry->d_inode, dentry, from->name); - done_path_create(&path, dentry); -out_putname: + error = security_path_symlink(&path, dentry, from->name); + if (!error) + error = vfs_symlink(path.dentry->d_inode, dentry, + from->name); + done_path_create(&path, dentry); + } while (retry_estale(error, try++)); putname(from); return error; } -- 1.7.11.4