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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 26DFAC04AAF for ; Thu, 16 May 2019 11:48:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E37D520833 for ; Thu, 16 May 2019 11:48:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558007310; bh=Ws+bFHUyMptDpf6Ro3V5FFO0qL8keE+Bq8CM4i285u8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2PeqX62cxGz1PqbvM5kvpX9h5kqAv2yfCza6jWJe/ApZplgMgEjvetAjuhjYx4aso xuxI0DrEJR0aDTuShEPDDv7xsLrCvwqkzXw/Lni2yCJ638uWAiD/rsUNCL3Rftfj5a qDNXqHG4M2ZsVAs/vLrOHeJRqq2dzxBfYD+jUbz0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727503AbfEPLjz (ORCPT ); Thu, 16 May 2019 07:39:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:47928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727427AbfEPLjw (ORCPT ); Thu, 16 May 2019 07:39:52 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A09B62166E; Thu, 16 May 2019 11:39:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558006792; bh=Ws+bFHUyMptDpf6Ro3V5FFO0qL8keE+Bq8CM4i285u8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aKg8MOv+4yU0eXv86kBtyV31dI+wqZ+VAALgaRrTwjPph5sn/M3ggxrg0FD8VOFRz oyl9+pxHukLRmCFc+fXDWSDCJA1nAtezbpw/avS6Pv0XIUWdBYUg+csSL2O3Ba4wfe EmJxG1MobILRBZJ9GxkoB+InmeJPc++bqgDjHHpY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Al Viro , Sasha Levin , linux-security-module@vger.kernel.org Subject: [PATCH AUTOSEL 5.0 15/34] apparmorfs: fix use-after-free on symlink traversal Date: Thu, 16 May 2019 07:39:12 -0400 Message-Id: <20190516113932.8348-15-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190516113932.8348-1-sashal@kernel.org> References: <20190516113932.8348-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro [ Upstream commit f51dcd0f621caac5380ce90fbbeafc32ce4517ae ] symlink body shouldn't be freed without an RCU delay. Switch apparmorfs to ->destroy_inode() and use of call_rcu(); free both the inode and symlink body in the callback. Signed-off-by: Al Viro Signed-off-by: Sasha Levin --- security/apparmor/apparmorfs.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 3f80a684c232a..665853dd517ca 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -123,17 +123,22 @@ static int aafs_show_path(struct seq_file *seq, struct dentry *dentry) return 0; } -static void aafs_evict_inode(struct inode *inode) +static void aafs_i_callback(struct rcu_head *head) { - truncate_inode_pages_final(&inode->i_data); - clear_inode(inode); + struct inode *inode = container_of(head, struct inode, i_rcu); if (S_ISLNK(inode->i_mode)) kfree(inode->i_link); + free_inode_nonrcu(inode); +} + +static void aafs_destroy_inode(struct inode *inode) +{ + call_rcu(&inode->i_rcu, aafs_i_callback); } static const struct super_operations aafs_super_ops = { .statfs = simple_statfs, - .evict_inode = aafs_evict_inode, + .destroy_inode = aafs_destroy_inode, .show_path = aafs_show_path, }; -- 2.20.1