From nobody Fri Dec 19 19:00:02 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0FBCD1C9EB1; Sun, 24 Mar 2024 22:46:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320384; cv=none; b=tOtNzxlQDL21enzF0hCDLWh26c9cBsm7nvccgzHDoMd1nyh7B6767ZMc5hoWREVyWMRJ89hdpYjhdT6C45TJn4zDXzWlULbF8h1qXbbTN2omPfClN/PTn8Z5RkcGZGKSjufBGTsP/B2wUdHB70YduxeaLJ3eOoX5AvC9wIBQ7MU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320384; c=relaxed/simple; bh=qPqRV2EP6kpC6/451Xi6W2Alk4HTibFzdN5q6rAgiqw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BNp+IwE6KqaLbGOzBUxCRFLTGEKQXfbZmX0ggOypNb+K83Vxd0ehJj7JJustw+zllBBxOvK1jeJfrO7xTCXHBHQyhOXA+FGQDgyXxf3nMktVRs8AJw5aQivXck+q+dpJHm1D6DXYAM8l7oMyKXKofCJ4UOWVyLQwSts94IYR/iM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=njw8ca5x; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="njw8ca5x" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01A77C43390; Sun, 24 Mar 2024 22:46:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320383; bh=qPqRV2EP6kpC6/451Xi6W2Alk4HTibFzdN5q6rAgiqw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=njw8ca5xSVXWPXWrIpmGL6/spAV/81oJCtXKd8Id0M36NR3vplhnKou+ZDxUlIzAR ed8e/+eHrq3AXz/RhnEAmmwQ1jgrK2tvOZco/tI3ocwt2Uu6qbtUM3cYM4pwiD+i1r ZsLKQjxzzOFNw6bF87s39bT4hhFl45svhCuB3VDt566HTX2NnvvMKL5CvKFjto9peU 2AZggU/dyOPbfyiZcuYjXTWDXMIKt2NczSBaPCotdv5wvDV4MsC4cyP3WlPizNAV1I 3JPEDbiShWw1Oh7Cb2qr21xGIWv/gGZvnapl90fH7jX5TKrgHocT/eOivsJNIKv3lt OX6b/+VGrqtMQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mikulas Patocka , Mike Snitzer , Sasha Levin Subject: [PATCH 6.8 689/715] dm-integrity: fix a memory leak when rechecking the data Date: Sun, 24 Mar 2024 18:34:28 -0400 Message-ID: <20240324223455.1342824-690-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324223455.1342824-1-sashal@kernel.org> References: <20240324223455.1342824-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Mikulas Patocka [ Upstream commit 55e565c42dce81a4e49c13262d5bc4eb4c2e588a ] Memory for the "checksums" pointer will leak if the data is rechecked after checksum failure (because the associated kfree won't happen due to 'goto skip_io'). Fix this by freeing the checksums memory before recheck, and just use the "checksum_onstack" memory for storing checksum during recheck. Fixes: c88f5e553fe3 ("dm-integrity: recheck the integrity tag after a failu= re") Signed-off-by: Mikulas Patocka Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- drivers/md/dm-integrity.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index 1fc901df84eb1..f194ce6bfacb5 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -1848,12 +1848,12 @@ static void integrity_metadata(struct work_struct *= w) r =3D dm_integrity_rw_tag(ic, checksums, &dio->metadata_block, &dio->me= tadata_offset, checksums_ptr - checksums, dio->op =3D=3D REQ_OP_READ ? TAG_CMP : TA= G_WRITE); if (unlikely(r)) { + if (likely(checksums !=3D checksums_onstack)) + kfree(checksums); if (r > 0) { - integrity_recheck(dio, checksums); + integrity_recheck(dio, checksums_onstack); goto skip_io; } - if (likely(checksums !=3D checksums_onstack)) - kfree(checksums); goto error; } =20 --=20 2.43.0