From patchwork Thu Nov 8 15:32:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 1716381 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 A0A9EDF280 for ; Thu, 8 Nov 2012 15:33:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752779Ab2KHPdA (ORCPT ); Thu, 8 Nov 2012 10:33:00 -0500 Received: from mx1.netapp.com ([216.240.18.38]:17796 "EHLO mx1.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752600Ab2KHPdA (ORCPT ); Thu, 8 Nov 2012 10:33:00 -0500 X-IronPort-AV: E=Sophos;i="4.80,738,1344236400"; d="scan'208";a="223827241" Received: from smtp2.corp.netapp.com ([10.57.159.114]) by mx1-out.netapp.com with ESMTP; 08 Nov 2012 07:33:00 -0800 Received: from lade.trondhjem.org.com ([10.63.229.46]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id qA8FWvsE023229; Thu, 8 Nov 2012 07:32:58 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Cc: Stanislav Kinsbursky Subject: [PATCH] SUNRPC: Fix validity issues with rpc_pipefs sb->s_fs_info Date: Thu, 8 Nov 2012 10:32:54 -0500 Message-Id: <1352388774-37495-1-git-send-email-Trond.Myklebust@netapp.com> X-Mailer: git-send-email 1.7.11.7 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org rpc_fill_super must not exit without setting sb->s_fs_info, since it is used in rpc_kill_sb(), which is called by mount_ns() on failure. rpc_kill_sb() must defer calling put_net() until after the notifier has been called, since most (all?) of the notifier callbacks assume that sb->s_fs_info points to a valid net namespace. Signed-off-by: Trond Myklebust Cc: Stanislav Kinsbursky Cc: stable@vger.kernel.org [>= v3.4] --- net/sunrpc/rpc_pipe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 21fde99..253af66 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c @@ -1112,6 +1112,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) sb->s_magic = RPCAUTH_GSSMAGIC; sb->s_op = &s_ops; sb->s_time_gran = 1; + sb->s_fs_info = get_net(net); inode = rpc_get_inode(sb, S_IFDIR | S_IRUGO | S_IXUGO); sb->s_root = root = d_make_root(inode); @@ -1127,7 +1128,6 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) sb); if (err) goto err_depopulate; - sb->s_fs_info = get_net(net); return 0; err_depopulate: @@ -1154,13 +1154,13 @@ static void rpc_kill_sb(struct super_block *sb) mutex_lock(&sn->pipefs_sb_lock); sn->pipefs_sb = NULL; mutex_unlock(&sn->pipefs_sb_lock); - put_net(net); dprintk("RPC: sending pipefs UMOUNT notification for net %p%s\n", net, NET_NAME(net)); blocking_notifier_call_chain(&rpc_pipefs_notifier_list, RPC_PIPEFS_UMOUNT, sb); kill_litter_super(sb); + put_net(net); } static struct file_system_type rpc_pipe_fs_type = {