From patchwork Sat Oct 27 12:33:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655021 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 0BCBDDFAC4 for ; Sat, 27 Oct 2012 12:34:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755734Ab2J0MeW (ORCPT ); Sat, 27 Oct 2012 08:34:22 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:64624 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755538Ab2J0MeU (ORCPT ); Sat, 27 Oct 2012 08:34:20 -0400 Received: by mail-gg0-f174.google.com with SMTP id k5so690943ggd.19 for ; Sat, 27 Oct 2012 05:34:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=BJLK3J9R5wj47FAbupryHZHTMAiA8x6QCXmtgo/r6y4=; b=dl44VcYNRf895LMscCfsaJzwke6n3Bfhs+qKDTyM3EPzDQjUXE69FGXJNi5FFN5hGX H6Wo4jcms4Ux0IKklvUiocZVZd9m7iRU8APzURYJw42oGyFx/79/VkYmb82kSJQVEQ8h b/POIwNaQcmxVvUaE+xg2OTL/0K/Md0/60ZG3iYp3lPjbiPPX4UgvkTPr/czoW9/LC3h Btu4oAgFeXAZiMZhcTxp4MvxcjVi+UM7fIsVCKnT4qFBVZn9or47e2aBOn7YPL3JKTk1 /t+ERofBu3AO+EMCDLzATAodcUb6DnozG2XSOim1H5CFyaY2nRg9SH8pkju3MNSYwjJJ uK0w== Received: by 10.101.132.21 with SMTP id j21mr2621477ann.40.1351341259852; Sat, 27 Oct 2012 05:34:19 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-107-015-110-129.nc.res.rr.com. [107.15.110.129]) by mx.google.com with ESMTPS id f15sm4124613yhi.11.2012.10.27.05.34.18 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:34:19 -0700 (PDT) From: Jeff Layton To: viro@zeniv.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, michael.brantley@deshaw.com, hch@infradead.org, miklos@szeredi.hu, pstaubach@exagrid.com Subject: [PATCH v8 16/32] vfs: make chroot retry once on ESTALE error Date: Sat, 27 Oct 2012 08:33:23 -0400 Message-Id: <1351341219-17837-17-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351341219-17837-1-git-send-email-jlayton@redhat.com> References: <1351341219-17837-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQm4UW3DR0ZBdG4iZHNO/mRIe0gHbJI0AAXZf8fP51hXsAHXu31k0hThdpNmNrl4LlFY1uNy Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Jeff Layton --- fs/open.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/fs/open.c b/fs/open.c index 5c2a973..a1331f1 100644 --- a/fs/open.c +++ b/fs/open.c @@ -434,27 +434,32 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename) { struct path path; int error; + int lookup_flags = LOOKUP_FOLLOW | LOOKUP_DIRECTORY; + unsigned int try = 0; - error = user_path_dir(filename, &path); - if (error) - goto out; + do { + error = user_path_at(AT_FDCWD, filename, lookup_flags, &path); + if (error) + break; - error = inode_permission(path.dentry->d_inode, MAY_EXEC | MAY_CHDIR); - if (error) - goto dput_and_out; + error = inode_permission(path.dentry->d_inode, + MAY_EXEC | MAY_CHDIR); + if (error) + goto dput_and_out; - error = -EPERM; - if (!capable(CAP_SYS_CHROOT)) - goto dput_and_out; - error = security_path_chroot(&path); - if (error) - goto dput_and_out; + error = -EPERM; + if (!capable(CAP_SYS_CHROOT)) + goto dput_and_out; + error = security_path_chroot(&path); + if (error) + goto dput_and_out; - set_fs_root(current->fs, &path); - error = 0; + set_fs_root(current->fs, &path); + error = 0; dput_and_out: - path_put(&path); -out: + path_put(&path); + lookup_flags |= LOOKUP_REVAL; + } while (retry_estale(error, try++)); return error; }