From patchwork Fri Aug 12 02:48:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 9276259 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9326D6022E for ; Fri, 12 Aug 2016 02:51:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 862E92880A for ; Fri, 12 Aug 2016 02:51:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AFCC2880C; Fri, 12 Aug 2016 02:51:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AB202880A for ; Fri, 12 Aug 2016 02:51:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752559AbcHLCsF (ORCPT ); Thu, 11 Aug 2016 22:48:05 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:58170 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752495AbcHLCsD (ORCPT ); Thu, 11 Aug 2016 22:48:03 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id B8E552029C; Thu, 11 Aug 2016 22:48:02 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute7.internal (MEProxy); Thu, 11 Aug 2016 22:48:02 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=themaw.net; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=Bk3fSnZrIcDVeTXWRvtk9T+LbSk=; b=ifHyZY 6Gr0ThDtnBHJeIBhioQX8lO85TQssoF0ZD+l/OW3jiqrmxIhtBGfxYZ3P07wdt5X 5tgctiofF1OaDgDJxt7Vqj+0t7qwLC3rcjr1wmZPjPZvs59ixSwGRqq52owLsXpq GbZ8G4N/uB/vGajm4iConTmgLYBpdQ6VvFCMY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=Bk3fSnZrIcDVeTX WRvtk9T+LbSk=; b=OVPN5DrwpiU2rWiWfy2+a2Dv65O3bYGP+Wbnv8mSUhw3mjL Fhw2ZhA8cNxbeMtAlxyh52WY/1fEv5EkUNtcS4lJAkCgO/ZoUEioGKicxvZqYssW HVObJi4ytwILAGJ3GNpQUTIGo+W3IMY6Iix2lMJtZp02qrV6ZA3dJCKr2QLc= X-Sasl-enc: WG6R9YKIHkpAjK1+WELuIJLom7QS0oDvGjFV0z6bc5/J 1470970082 Received: from pluto.themaw.net (58-7-183-14.dyn.iinet.net.au [58.7.183.14]) by mail.messagingengine.com (Postfix) with ESMTPA id 2B9BACCE66; Thu, 11 Aug 2016 22:48:02 -0400 (EDT) Received: from pluto.themaw.net (localhost [127.0.0.1]) by pluto.themaw.net (Postfix) with ESMTP id 1EF93A0078; Fri, 12 Aug 2016 10:48:00 +0800 (AWST) Subject: [PATCH 06/18] autofs - remove ino free in autofs4_dir_symlink() From: Ian Kent To: Andrew Morton Cc: linux-fsdevel , Tomohiro Kusumi , autofs mailing list , Kernel Mailing List Date: Fri, 12 Aug 2016 10:48:00 +0800 Message-ID: <20160812024759.12352.10653.stgit@pluto.themaw.net> In-Reply-To: <20160812024734.12352.17122.stgit@pluto.themaw.net> References: <20160812024734.12352.17122.stgit@pluto.themaw.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The inode allocation failure case in autofs4_dir_symlink() frees the autofs dentry info of the dentry without setting ->d_fsdata to NULL. That could lead to a double free so just get rid of the free and leave it to ->d_release(). Signed-off-by: Ian Kent Cc: Tomohiro Kusumi --- fs/autofs4/root.c | 2 -- 1 file changed, 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index fa84bb8..1b0495a 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c @@ -577,8 +577,6 @@ static int autofs4_dir_symlink(struct inode *dir, inode = autofs4_get_inode(dir->i_sb, S_IFLNK | 0555); if (!inode) { kfree(cp); - if (!dentry->d_fsdata) - kfree(ino); return -ENOMEM; } inode->i_private = cp;