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 0D768C43381 for ; Tue, 12 Mar 2019 17:12:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCF86206DF for ; Tue, 12 Mar 2019 17:12:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552410765; bh=htHF7JmuwJXGD+TfSlhTRGjBhk//reNr5bUe2p048co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HIZ5TTp2rO3Y5fplLCFo+IL1XQDFKJCUUA3RXHvkiWpYdlA4C0qCzPhx7DIlWXVcI 7Ksg7ft6xx/q8qDqkQWmP/t7AHOnBSqpXhqVBL02aqzPq+6jFr1PV7rezIvwcw8y4F OVTEVhAI1uvkgpqEEme2NEovrdFcYdlaoaa4zWyo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726744AbfCLRMo (ORCPT ); Tue, 12 Mar 2019 13:12:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:47500 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727439AbfCLRMY (ORCPT ); Tue, 12 Mar 2019 13:12:24 -0400 Received: from localhost (unknown [104.133.8.98]) (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 95275206DF; Tue, 12 Mar 2019 17:12:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552410743; bh=htHF7JmuwJXGD+TfSlhTRGjBhk//reNr5bUe2p048co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YZQBYKGJBZA/uMI77I3ZRgWaSTtWOtz3qAA+3whndnS2z8AGO48iFXBUFno9m3nLf XclXqC0ntfuYoQoxEUB9tCtxWAsy/37oyB02VPKAGvZW1I3htdZW7SkTahkzyYPQsN +SK7wcShW3VAPOSammvLKB/0JFIgXMwUNoKG6WxE= 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.20 069/171] autofs: fix error return in autofs_fill_super() Date: Tue, 12 Mar 2019 10:07:29 -0700 Message-Id: <20190312170354.097088685@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190312170347.868927101@linuxfoundation.org> References: <20190312170347.868927101@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.20-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/autofs/inode.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c index 846c052569dd..3c14a8e45ffb 100644 --- a/fs/autofs/inode.c +++ b/fs/autofs/inode.c @@ -255,8 +255,10 @@ int autofs_fill_super(struct super_block *s, void *data, int silent) } root_inode = autofs_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