From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754489AbbCaDPj (ORCPT ); Mon, 30 Mar 2015 23:15:39 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:34275 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754035AbbCaDPd (ORCPT ); Mon, 30 Mar 2015 23:15:33 -0400 X-Sasl-enc: 3GviDgfDMqO5UFxDjV3CR6AUZg0hMBVBwuGVa6LnXqMT 1427771732 Subject: [RFC PATCH 5 5/7] nfs - objlayout use service thread 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: Tue, 31 Mar 2015 11:15:14 +0800 Message-ID: <20150331031512.10464.15177.stgit@pluto.fritz.box> In-Reply-To: <20150331030340.10464.30272.stgit@pluto.fritz.box> References: <20150331030340.10464.30272.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 From: Ian Kent If the caller is running within a container then execute the usermode helper callback within the container also. 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/objlayout/objlayout.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/fs/nfs/objlayout/objlayout.c b/fs/nfs/objlayout/objlayout.c index 919efd4..1d4fd11 100644 --- a/fs/nfs/objlayout/objlayout.c +++ b/fs/nfs/objlayout/objlayout.c @@ -600,8 +600,14 @@ static int __objlayout_upcall(struct __auto_login *login) NULL }; char *argv[8]; + int umh_token; int ret; + /* If running within a container use the container namespace */ + umh_token = 0; + if (current->nsproxy->net_ns != &init_net) + umh_token = umh_wq_get_token(0, "objlayout"); + if (unlikely(!osd_login_prog[0])) { dprintk("%s: osd_login_prog is disabled\n", __func__); return -EACCES; @@ -620,7 +626,13 @@ static int __objlayout_upcall(struct __auto_login *login) argv[6] = login->systemid_hex; argv[7] = NULL; - ret = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC); + if (!umh_token) + ret = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC); + else { + ret = call_usermodehelper_service(argv[0], argv, envp, + umh_token, UMH_WAIT_PROC); + umh_wq_put_token(umh_token); + } /* * Disable the upcall mechanism if we're getting an ENOENT or * EACCES error. The admin can re-enable it on the fly by using