From patchwork Tue Aug 27 20:58:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 2850328 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id ED67A9F495 for ; Tue, 27 Aug 2013 20:59:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E89C7204BB for ; Tue, 27 Aug 2013 20:59:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2567C204B2 for ; Tue, 27 Aug 2013 20:59:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752996Ab3H0U7D (ORCPT ); Tue, 27 Aug 2013 16:59:03 -0400 Received: from mx11.netapp.com ([216.240.18.76]:15345 "EHLO mx11.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753190Ab3H0U7B (ORCPT ); Tue, 27 Aug 2013 16:59:01 -0400 X-IronPort-AV: E=Sophos;i="4.89,970,1367996400"; d="scan'208";a="44797723" Received: from vmwexceht03-prd.hq.netapp.com ([10.106.76.241]) by mx11-out.netapp.com with ESMTP; 27 Aug 2013 13:59:01 -0700 Received: from smtp2.corp.netapp.com (10.57.159.114) by VMWEXCEHT03-PRD.hq.netapp.com (10.106.76.241) with Microsoft SMTP Server id 14.3.123.3; Tue, 27 Aug 2013 13:59:01 -0700 Received: from leira.trondhjem.org.com (leira.trondhjem.org.vpn.netapp.com [10.55.73.197]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id r7RKwtlQ011421; Tue, 27 Aug 2013 13:59:00 -0700 (PDT) From: Trond Myklebust To: CC: Subject: [PATCH 08/15] NFSv4: Fix a potentially Oopsable condition in __nfs_idmap_unregister Date: Tue, 27 Aug 2013 16:58:45 -0400 Message-ID: <1377637132-53318-8-git-send-email-Trond.Myklebust@netapp.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1377637132-53318-7-git-send-email-Trond.Myklebust@netapp.com> References: <1377637132-53318-1-git-send-email-Trond.Myklebust@netapp.com> <1377637132-53318-2-git-send-email-Trond.Myklebust@netapp.com> <1377637132-53318-3-git-send-email-Trond.Myklebust@netapp.com> <1377637132-53318-4-git-send-email-Trond.Myklebust@netapp.com> <1377637132-53318-5-git-send-email-Trond.Myklebust@netapp.com> <1377637132-53318-6-git-send-email-Trond.Myklebust@netapp.com> <1377637132-53318-7-git-send-email-Trond.Myklebust@netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Ensure that __nfs_idmap_unregister can be called twice without consequences. Signed-off-by: Trond Myklebust --- fs/nfs/idmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index e9b0c59..8b7e94a 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c @@ -404,8 +404,10 @@ static struct key_type key_type_id_resolver_legacy = { static void __nfs_idmap_unregister(struct rpc_pipe *pipe) { - if (pipe->dentry) + if (pipe->dentry) { rpc_unlink(pipe->dentry); + pipe->dentry = NULL; + } } static int __nfs_idmap_register(struct dentry *dir,