Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161822AbbBECey (ORCPT ); Wed, 4 Feb 2015 21:34:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42675 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756338AbbBECew (ORCPT ); Wed, 4 Feb 2015 21:34:52 -0500 Subject: [RFC PATCH 7/8] nfs - cache_lib use namespace if not executing in init namespace From: Ian Kent To: Kernel Mailing List Cc: David Howells , Oleg Nesterov , Trond Myklebust , "J. Bruce Fields" , Benjamin Coddington , Al Viro , Jeff Layton , "Eric W. Biederman" Date: Thu, 05 Feb 2015 10:34:37 +0800 Message-ID: <20150205023436.8382.19875.stgit@pluto.fritz.box> In-Reply-To: <20150205021553.8382.16297.stgit@pluto.fritz.box> References: <20150205021553.8382.16297.stgit@pluto.fritz.box> User-Agent: StGit/0.17-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2011 Lines: 57 If the caller is running within a container then execute the usermode helper callback within the init namespace of the container. Signed-off-by: Ian Kent Cc: Benjamin Coddington Cc: Al Viro Cc: J. Bruce Fields Cc: David Howells Cc: Trond Myklebust Cc: Oleg Nesterov Cc: Eric W. Biederman Cc: Jeff Layton --- fs/nfs/cache_lib.c | 6 +++++- fs/nfsd/nfs4recover.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/nfs/cache_lib.c b/fs/nfs/cache_lib.c index 5f7b053..1f7f6c1 100644 --- a/fs/nfs/cache_lib.c +++ b/fs/nfs/cache_lib.c @@ -44,11 +44,15 @@ int nfs_cache_upcall(struct cache_detail *cd, char *entry_name) entry_name, NULL }; + int umh_flags = UMH_WAIT_EXEC; int ret = -EACCES; + if (cd->net != &init_net) + umh_flags |= UMH_USE_NS; + if (nfs_cache_getent_prog[0] == '\0') goto out; - ret = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC); + ret = call_usermodehelper(argv[0], argv, envp, umh_flags); /* * Disable the upcall mechanism if we're getting an ENOENT or * EACCES error. The admin can re-enable it on the fly by using diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index b962856..0896ca7 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c @@ -1380,7 +1380,7 @@ nfsd4_umh_cltrack_check(struct nfs4_client *clp) } else { ret = nfsd4_umh_cltrack_upcall("check", hexid, has_session, legacy, - mm->umh_flags); + nn->umh_flags); if (ret == 0) set_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags); } -- 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/