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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 A9513C433DF for ; Thu, 20 Aug 2020 10:22:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 71AC520658 for ; Thu, 20 Aug 2020 10:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597918935; bh=bVvddrK+qoU01hUbXwqrKFPxQVIC31GFgroVKcw9PwE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZiOfrun+Ghr4QcE651HYinK0ZOKpX+8oPXp8Zn2c1hJQ70XwQlWXGAp+kaoAyBTML AbVKETLBYcvHeZkFhfeon2GMmPnR/OzIx+IULjITGtU8xDFUpLtxZHWUnVgdkE4uA1 uTpUdO1F+XonsHFXmyUXPPefPBt0PlIcXHQwjGWE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731585AbgHTKWL (ORCPT ); Thu, 20 Aug 2020 06:22:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:49166 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731579AbgHTKV7 (ORCPT ); Thu, 20 Aug 2020 06:21:59 -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 CC4CE2072D; Thu, 20 Aug 2020 10:21:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597918919; bh=bVvddrK+qoU01hUbXwqrKFPxQVIC31GFgroVKcw9PwE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=baEoAGEVobTiznF2cHvluSu0q71UbeuPQRZ+6u5dmBnuAt7oBJKw+AbSWpG/C17Qy umpVK4BuSaiD8dLq6KGVJCiBNFdAESGXyvGxBwtl64m/UHKUWO022FSAi+dG6GN/Ih jSw9aXMew7SuWDw86gk1VrKNBYxDoW9FFuUsDBZ4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zheng Bin , Dominique Martinet Subject: [PATCH 4.4 115/149] 9p: Fix memory leak in v9fs_mount Date: Thu, 20 Aug 2020 11:23:12 +0200 Message-Id: <20200820092131.267368313@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820092125.688850368@linuxfoundation.org> References: <20200820092125.688850368@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Zheng Bin commit cb0aae0e31c632c407a2cab4307be85a001d4d98 upstream. v9fs_mount v9fs_session_init v9fs_cache_session_get_cookie v9fs_random_cachetag -->alloc cachetag v9ses->fscache = fscache_acquire_cookie -->maybe NULL sb = sget -->fail, goto clunk clunk_fid: v9fs_session_close if (v9ses->fscache) -->NULL kfree(v9ses->cachetag) Thus memleak happens. Link: http://lkml.kernel.org/r/20200615012153.89538-1-zhengbin13@huawei.com Fixes: 60e78d2c993e ("9p: Add fscache support to 9p") Cc: # v2.6.32+ Signed-off-by: Zheng Bin Signed-off-by: Dominique Martinet Signed-off-by: Greg Kroah-Hartman --- fs/9p/v9fs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/fs/9p/v9fs.c +++ b/fs/9p/v9fs.c @@ -457,10 +457,9 @@ void v9fs_session_close(struct v9fs_sess } #ifdef CONFIG_9P_FSCACHE - if (v9ses->fscache) { + if (v9ses->fscache) v9fs_cache_session_put_cookie(v9ses); - kfree(v9ses->cachetag); - } + kfree(v9ses->cachetag); #endif kfree(v9ses->uname); kfree(v9ses->aname);