From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752009Ab3LCFLt (ORCPT ); Tue, 3 Dec 2013 00:11:49 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:46089 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751672Ab3LCFLj (ORCPT ); Tue, 3 Dec 2013 00:11:39 -0500 X-Sasl-enc: s5xjqB+UKqPdB2V7PQ8ZGqyoEDy3+Ev00tsT6tROoucN 1386047498 Subject: [PATCH 1/2] autofs: fix the return value of autofs4_fill_super To: Andrew Morton From: Ian Kent Cc: linux-fsdevel , Rui Xiang , autofs mailing list , Kernel Mailing List Date: Tue, 03 Dec 2013 13:11:36 +0800 Message-ID: <20131203051135.15048.28126.stgit@perseus.fritz.box> In-Reply-To: <20131203050323.15048.52933.stgit@perseus.fritz.box> References: <20131203050323.15048.52933.stgit@perseus.fritz.box> User-Agent: StGit/0.16 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: Rui Xiang While kzallocing sbi/ino fails, it should return -ENOMEM. And it should return the err value from autofs_prepare_pipe. Signed-off-by: Rui Xiang Acked-by: Ian Kent --- fs/autofs4/inode.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index 3b9cc9b..07d22c0 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c @@ -206,10 +206,11 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) int pipefd; struct autofs_sb_info *sbi; struct autofs_info *ino; + int ret = -EINVAL; sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) - goto fail_unlock; + return -ENOMEM; DPRINTK("starting up, sbi = %p",sbi); s->s_fs_info = sbi; @@ -243,8 +244,10 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) * Get the root inode and dentry, but defer checking for errors. */ ino = autofs4_new_ino(sbi); - if (!ino) + if (!ino) { + ret = -ENOMEM; goto fail_free; + } root_inode = autofs4_get_inode(s, S_IFDIR | 0755); root = d_make_root(root_inode); if (!root) @@ -291,7 +294,8 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) printk("autofs: could not open pipe file descriptor\n"); goto fail_dput; } - if (autofs_prepare_pipe(pipe) < 0) + ret = autofs_prepare_pipe(pipe); + if (ret < 0) goto fail_fput; sbi->pipe = pipe; sbi->pipefd = pipefd; @@ -318,8 +322,7 @@ fail_ino: fail_free: kfree(sbi); s->s_fs_info = NULL; -fail_unlock: - return -EINVAL; + return ret; } struct inode *autofs4_get_inode(struct super_block *sb, umode_t mode)