From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 424EFC43381 for ; Fri, 22 Mar 2019 13:11:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0970E2183E for ; Fri, 22 Mar 2019 13:11:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553260277; bh=WDYAB2J3TGkunigD1lEIQ9RMiWWzoiiT+25Piy5uZa4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K3mspYf1SYNHk08QsIdZjCHp4VCyjhfsZsKQPKw+sPKYYtKqDxrdK/AbLm1JGpDJD QNTWYmAkFN4qTN0D7CoCOdSOxXhEpso7uVFhAc79G2mxg2G25X9WmQKa0VG3nDlkCD CTFBcoodBob/8GZ561p9ooO8+2F6MTkzvkhCEChQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730466AbfCVNLP (ORCPT ); Fri, 22 Mar 2019 09:11:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:33424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729587AbfCVLdD (ORCPT ); Fri, 22 Mar 2019 07:33:03 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5970A21925; Fri, 22 Mar 2019 11:33:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254382; bh=WDYAB2J3TGkunigD1lEIQ9RMiWWzoiiT+25Piy5uZa4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nAfJkuVFehblApQA9ye73U3V5iH/bPItFAeAVyJZJolZZGwJpqiyxBPkciChZ17If P5y4NeZ3yZtY/oA10TXgnJhrJ2VNdeHVHSjqTbbH813eYhVKQg/AhzrFeWCn/qvdkZ IHVBTsuP7uAl8GuXkondyhdOflyo1/xwVfzTV/KM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ian Kent , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 4.4 104/230] autofs: fix error return in autofs_fill_super() Date: Fri, 22 Mar 2019 12:14:02 +0100 Message-Id: <20190322111243.888838343@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111236.796964179@linuxfoundation.org> References: <20190322111236.796964179@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit f585b283e3f025754c45bbe7533fc6e5c4643700 ] In autofs_fill_super() on error of get inode/make root dentry the return should be ENOMEM as this is the only failure case of the called functions. Link: http://lkml.kernel.org/r/154725123240.11260.796773942606871359.stgit@pluto-themaw-net Signed-off-by: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- fs/autofs4/inode.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index 1132fe71b312..0fd472d67029 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c @@ -255,8 +255,10 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) } root_inode = autofs4_get_inode(s, S_IFDIR | 0755); root = d_make_root(root_inode); - if (!root) + if (!root) { + ret = -ENOMEM; goto fail_ino; + } pipe = NULL; root->d_fsdata = ino; -- 2.19.1