From patchwork Wed Aug 28 19:40:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 2850967 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 DBCA89F271 for ; Wed, 28 Aug 2013 19:40:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9755203F4 for ; Wed, 28 Aug 2013 19:40:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3DAF20184 for ; Wed, 28 Aug 2013 19:40:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754584Ab3H1Tkz (ORCPT ); Wed, 28 Aug 2013 15:40:55 -0400 Received: from mx12.netapp.com ([216.240.18.77]:1449 "EHLO mx12.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754332Ab3H1Tky (ORCPT ); Wed, 28 Aug 2013 15:40:54 -0400 X-IronPort-AV: E=Sophos;i="4.89,977,1367996400"; d="scan'208";a="84744471" Received: from vmwexceht02-prd.hq.netapp.com ([10.106.76.240]) by mx12-out.netapp.com with ESMTP; 28 Aug 2013 12:40:30 -0700 Received: from smtp2.corp.netapp.com (10.57.159.114) by VMWEXCEHT02-PRD.hq.netapp.com (10.106.76.240) with Microsoft SMTP Server id 14.3.123.3; Wed, 28 Aug 2013 12:40:30 -0700 Received: from leira.trondhjem.org.com (leira.trondhjem.org.vpn.netapp.com [10.55.74.77]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id r7SJeOrZ013790; Wed, 28 Aug 2013 12:40:29 -0700 (PDT) From: Trond Myklebust To: CC: Subject: [PATCH v2 08/16] NFSv4: Fix a potentially Oopsable condition in __nfs_idmap_unregister Date: Wed, 28 Aug 2013 15:40:13 -0400 Message-ID: <1377718821-28159-8-git-send-email-Trond.Myklebust@netapp.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1377718821-28159-7-git-send-email-Trond.Myklebust@netapp.com> References: <1377718821-28159-1-git-send-email-Trond.Myklebust@netapp.com> <1377718821-28159-2-git-send-email-Trond.Myklebust@netapp.com> <1377718821-28159-3-git-send-email-Trond.Myklebust@netapp.com> <1377718821-28159-4-git-send-email-Trond.Myklebust@netapp.com> <1377718821-28159-5-git-send-email-Trond.Myklebust@netapp.com> <1377718821-28159-6-git-send-email-Trond.Myklebust@netapp.com> <1377718821-28159-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=unavailable 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,