From patchwork Fri Aug 12 02:47:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 9276263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5AB4C6022E for ; Fri, 12 Aug 2016 02:51:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D8602880A for ; Fri, 12 Aug 2016 02:51:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4256F2880C; Fri, 12 Aug 2016 02:51:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC0B52880A for ; Fri, 12 Aug 2016 02:51:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752439AbcHLCrz (ORCPT ); Thu, 11 Aug 2016 22:47:55 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:55796 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752422AbcHLCrx (ORCPT ); Thu, 11 Aug 2016 22:47:53 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 8108420545; Thu, 11 Aug 2016 22:47:52 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute7.internal (MEProxy); Thu, 11 Aug 2016 22:47:52 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=themaw.net; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=PDIkZnvGu77fuuQ2s8WQ5MOOwHM=; b=Qc8Hn8 u0DFBvrSc6UaUpZgsQxk6a/W/fEzlp0QRqtB3v66Zt6vY91Bn0GMq2JNPY5CwyNh JhRQfe0n7ZlAjJnUitRBx+k+PrFOWxrlWtAgbTK7b5jlZ8BWA+tF2H5x3Ftomcv7 gdA9HvSM9CZHRqGFpvu5xvw2U/Oy/Rk5OH5XI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=PDIkZnvGu77fuuQ 2s8WQ5MOOwHM=; b=FgNPOCrGb7nkZwztvrDcVor0wi7LVPfsdKDyCTzb+Xd/BiI TXo5hd1adDqFFtQDiEx2vAqmzmsBNYfz+Kw3TyByVgAbYyG6E7A6r4J3k0rhs/Pk J+ASIKFWsbl21dST1c3iHk7jjx+6zepglQIrkS8hpuuVJwhh9esN0FSx7HCo= X-Sasl-enc: Cu7X0JLzSuhrEokp8AifhZSZsuKjjeaDZpMb8R167UaQ 1470970071 Received: from pluto.themaw.net (58-7-183-14.dyn.iinet.net.au [58.7.183.14]) by mail.messagingengine.com (Postfix) with ESMTPA id DC5ECCCD84; Thu, 11 Aug 2016 22:47:51 -0400 (EDT) Received: from pluto.themaw.net (localhost [127.0.0.1]) by pluto.themaw.net (Postfix) with ESMTP id AFC2BA0078; Fri, 12 Aug 2016 10:47:49 +0800 (AWST) Subject: [PATCH 04/18] autofs - fix autofs4_fill_super() error exit handling From: Ian Kent To: Andrew Morton Cc: linux-fsdevel , Tomohiro Kusumi , autofs mailing list , Kernel Mailing List Date: Fri, 12 Aug 2016 10:47:49 +0800 Message-ID: <20160812024749.12352.15100.stgit@pluto.themaw.net> In-Reply-To: <20160812024734.12352.17122.stgit@pluto.themaw.net> References: <20160812024734.12352.17122.stgit@pluto.themaw.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Somewhere along the line the error handling gotos have become incorrect. Signed-off-by: Ian Kent Cc: Tomohiro Kusumi --- fs/autofs4/inode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index 8357544..64d721f 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c @@ -313,7 +313,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) if (!pipe) { pr_err("could not open pipe file descriptor\n"); - goto fail_dput; + goto fail_put_pid; } ret = autofs_prepare_pipe(pipe); if (ret < 0) @@ -334,14 +334,14 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) fail_fput: pr_err("pipe file descriptor does not contain proper ops\n"); fput(pipe); - /* fall through */ +fail_put_pid: + put_pid(sbi->oz_pgrp); fail_dput: dput(root); goto fail_free; fail_ino: kfree(ino); fail_free: - put_pid(sbi->oz_pgrp); kfree(sbi); s->s_fs_info = NULL; return ret;