From nobody Sat Dec 17 18:20:51 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NZDmh0xdPz1CYcP; Sat, 17 Dec 2022 18:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NZDmh0G0Sz45sn; Sat, 17 Dec 2022 18:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671301252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rfadatC2LWg3faceVbMBVlCVo8K9EYWXIR7wSV4BsOw=; b=uYw9bSKdVE9JKK5cGyJoMqqy7Cm0M3mr+G8vdWSmXhWq/307SPDqvA08oRqRWEj8Y4FH2g L8pkBIfAUulWD841bQwdKTcHyqWnguWnMuRuzOpqRrHF7kKqhYqTkPT26CWuuW35/mbKSo fuxT0LBDjClCijyi2PTLbYpqBvmQY5aon8I0+3GGRbPwzKtOs6oKGe8sYgsfKLh7ekvm7y cyiXdfHrUyeHhk74tBszoqDRaVIeq+ZmC5lKpLqFd1wNorrK6BEea1P56uz3UJ/8TD/+m8 5yMTP9SH53s8vg588Fgg69/ivzc6LqxFAxfE2gIZjiAVz6raMHJOOhkzpc+rpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671301252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rfadatC2LWg3faceVbMBVlCVo8K9EYWXIR7wSV4BsOw=; b=pYNE9NlrudICOO+78KJUrXPNvl4L6gzQ/MmfCRK1W+wI/9AYPNSaD9ylsResiajSMqJoYj 013xUHkk6BjNVdQrj7X5irJHQYV/vc3iuP7NMm/iG4sSSlSZJWiJWCsfGKXJrnr9mPjBR6 nEzn0HUgaGLp4qHhfCjjjNThlhiSCigCzTA1x6+zejFfvygEFHL6JA1HpTwuxNUcHfvpSa Nz8cFxT0OVH9LvzZybH6ayiNo24K00zwk51OxX79EkWr5UgMGCFskxmoysV1asZPF4FstE YRNVMZWqhHeMXc93xlMXO90w0FMjasBovsIZ5IysSLe+J8IKl/QRHzZ/ZQmAYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671301252; a=rsa-sha256; cv=none; b=XmduTBR+3sDlO7UTcrhHT73NgwEnP7tDFraYdLpdrxIg2QLZ4p4W2cKrfaU5BKzd/RUGG9 r1/w7YQ3CB2Ft4trQXNtELZqYyWUcTXXDaHKh3jmBaKdUAkPmCJxcsPgqGECVcVWwvt5so y0BSxbx2swQ2+LXEf1JLMMmCEH1+vTIsxC7QjXOpnsuPJq5YE8Za6yjpvDTMi52vqqodEA ABmbjVvBXOlaZInAnvjqyCroORkSB9Pq2oEkiHqWjDF4EXODMd2mTxCx98FGqU/DX3XYm7 8TkcteXdTWd5i2ImPP10IvgpL7VrFioY0p05EQlWc31Woam3fsJlO++PyA+xZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NZDmg6QXVz128M; Sat, 17 Dec 2022 18:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BHIKpfV096042; Sat, 17 Dec 2022 18:20:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BHIKpB2096041; Sat, 17 Dec 2022 18:20:51 GMT (envelope-from git) Date: Sat, 17 Dec 2022 18:20:51 GMT Message-Id: <202212171820.2BHIKpB2096041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Pedro F. Giffuni" Subject: git: 38389acc59fc - main - ext2fs: fix potential memory leak in ext4_ext_grow_indepth() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pfg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38389acc59fcb014c5c9beed06a6f13835808b89 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pfg: URL: https://cgit.FreeBSD.org/src/commit/?id=38389acc59fcb014c5c9beed06a6f13835808b89 commit 38389acc59fcb014c5c9beed06a6f13835808b89 Author: Pedro F. Giffuni AuthorDate: 2022-12-17 18:19:51 +0000 Commit: Pedro F. Giffuni CommitDate: 2022-12-17 18:19:51 +0000 ext2fs: fix potential memory leak in ext4_ext_grow_indepth() PR: 265071 --- sys/fs/ext2fs/ext2_extents.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/fs/ext2fs/ext2_extents.c b/sys/fs/ext2fs/ext2_extents.c index 3d24db4b396b..17ae8655cddc 100644 --- a/sys/fs/ext2fs/ext2_extents.c +++ b/sys/fs/ext2fs/ext2_extents.c @@ -1099,8 +1099,10 @@ ext4_ext_grow_indepth(struct inode *ip, struct ext4_extent_path *path, return (error); bp = getblk(ip->i_devvp, fsbtodb(fs, newblk), fs->e2fs_bsize, 0, 0, 0); - if (!bp) + if (!bp) { + ext4_ext_blkfree(ip, newblk, 1, 0); return (EIO); + } /* Move top-level index/leaf into new block. */ memmove(bp->b_data, curpath->ep_header, sizeof(ip->i_data)); @@ -1116,8 +1118,10 @@ ext4_ext_grow_indepth(struct inode *ip, struct ext4_extent_path *path, ext2_extent_blk_csum_set(ip, bp->b_data); error = bwrite(bp); - if (error) + if (error) { + ext4_ext_blkfree(ip, newblk, 1, 0); goto out; + } bp = NULL;