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=-10.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,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 61EF1C433E0 for ; Thu, 2 Jul 2020 01:36:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 402FD20781 for ; Thu, 2 Jul 2020 01:36:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593653798; bh=q5PPXSNYwYNETXLnW13CPZbxXCtQGH4Z5Ed2lgifHKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=myTudVTixIZMMn/6XndEdV6oZ9GncN/weyVYqZk/EuflYG1KDur1S4e3J90wqesp8 WBcmKD1svXODNeABMegXm1+V02cux6zfK9gXmH19OJh/KoYBJWKd+YvWjaDjXk0wUO xEoiVeN8+4c9UUL4V7WNijL68qwiRuShpgOAz6zA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729109AbgGBBgh (ORCPT ); Wed, 1 Jul 2020 21:36:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:53494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728214AbgGBBXI (ORCPT ); Wed, 1 Jul 2020 21:23:08 -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 D555D2083E; Thu, 2 Jul 2020 01:23:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593652988; bh=q5PPXSNYwYNETXLnW13CPZbxXCtQGH4Z5Ed2lgifHKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LpZu+6ITCM7D6W613S3GngtsubwK2JuZojxXDueLpyIwOAJFNsfsjBPTP5Iem9PkD TGRYMOU2rn6/HILD81dJlDiZJrG5ZDWuPbA+CytnBDYVuEy9qmj9LBzEi2det92pDC uCDFSLJfwR6728jqDcbmMuQRu25vqmI1FcW6X00k= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Waiman Long , David Sterba , Sasha Levin , linux-btrfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 11/53] btrfs: use kfree() in btrfs_ioctl_get_subvol_info() Date: Wed, 1 Jul 2020 21:21:20 -0400 Message-Id: <20200702012202.2700645-11-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200702012202.2700645-1-sashal@kernel.org> References: <20200702012202.2700645-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Waiman Long [ Upstream commit b091f7fede97cc64f7aaad3eeb37965aebee3082 ] In btrfs_ioctl_get_subvol_info(), there is a classic case where kzalloc() was incorrectly paired with kzfree(). According to David Sterba, there isn't any sensitive information in the subvol_info that needs to be cleared before freeing. So kzfree() isn't really needed, use kfree() instead. Signed-off-by: Waiman Long Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 40b729dce91cd..5070bd2436b76 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2691,7 +2691,7 @@ static int btrfs_ioctl_get_subvol_info(struct file *file, void __user *argp) btrfs_put_root(root); out_free: btrfs_free_path(path); - kzfree(subvol_info); + kfree(subvol_info); return ret; } -- 2.25.1