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=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 5CF8DC43381 for ; Mon, 18 Feb 2019 14:13:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2BE2A217D7 for ; Mon, 18 Feb 2019 14:13:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550499187; bh=CJ7L/Etu0IvEAsMZnh3FnPSE5ugBj+HHjrGxbpr3cgE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u0NADMszyUAkA6IzZIYTUXLQXDwsBcLJncFyD3pLme1Hw5CsHNR9okULDvXjKIhf3 UA9zPU/CtGIggiwdbAoYHH2m3ty73nyzAs7hL73lqfBX3GBLPShNev9RJ6e5W236MC JrBBaTViLJfHa7cfTBvN0T8Txe8NNxuAjU4HnW4U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388932AbfBRONG (ORCPT ); Mon, 18 Feb 2019 09:13:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:57750 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392215AbfBRONF (ORCPT ); Mon, 18 Feb 2019 09:13:05 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 A5748218AD; Mon, 18 Feb 2019 14:13:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550499185; bh=CJ7L/Etu0IvEAsMZnh3FnPSE5ugBj+HHjrGxbpr3cgE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jZQ4yLDH1K8io6arYBw6Xyhm7iJNcluRvJ93TsJN0RLKJHzg1udDMQw6BBpxsvuVQ o9IY7zsVACqTA38jZyPqxHsv241yj9qZ/iUIRQXHvIAK2tDzPOfSQLgedKuvJGHEOY kZuZh7TB4MaNd+835M/h25l1DcW/WjBslmD0ktOs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org Subject: [PATCH 3.18 079/108] debugfs: fix debugfs_rename parameter checking Date: Mon, 18 Feb 2019 14:44:15 +0100 Message-Id: <20190218133523.182186159@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133519.525507231@linuxfoundation.org> References: <20190218133519.525507231@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman commit d88c93f090f708c18195553b352b9f205e65418f upstream. debugfs_rename() needs to check that the dentries passed into it really are valid, as sometimes they are not (i.e. if the return value of another debugfs call is passed into this one.) So fix this up by properly checking if the two parent directories are errors (they are allowed to be NULL), and if the dentry to rename is not NULL or an error. Cc: stable Signed-off-by: Greg Kroah-Hartman --- fs/debugfs/inode.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c @@ -622,6 +622,13 @@ struct dentry *debugfs_rename(struct den struct dentry *dentry = NULL, *trap; struct name_snapshot old_name; + if (IS_ERR(old_dir)) + return old_dir; + if (IS_ERR(new_dir)) + return new_dir; + if (IS_ERR_OR_NULL(old_dentry)) + return old_dentry; + trap = lock_rename(new_dir, old_dir); /* Source or destination directories don't exist? */ if (!old_dir->d_inode || !new_dir->d_inode)