From mboxrd@z Thu Jan 1 00:00:00 1970 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 C4B0D3EDE74; Tue, 12 May 2026 17:57:16 +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=1778608636; cv=none; b=hdz5vbAlzh54AEsW4oqqO6TLeWQhC5H43A883vVAqvEsrNq322g+PggRijzsrKInx+6xq92v8AwVKBi8yedtkuy0P5DXZ73VP2JUPuslAELr86ek8rVbErVW6q1F0rjEi2vV7lSqbfdOWkJwGhKhnp2oyS0xIMJCZPc65KHy8ng= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608636; c=relaxed/simple; bh=HYER1PsLHzwAXHRnM4sqWuvNUR4WqFRYyQDj76ClfKI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pEkOvYUcK8W7pyKWxw3bGmLH123+ru7WcuEHxXyptSdxDazz1a7FCUODuEdzhcBxTH3dAcdZ7prs0Dc2ZO7fk6dv0nFDCtm9vTH7fYVGDJCqiEQeF8VDDyYc/mOBTXvWWPGr2KBUVq+KRTaAA/gMCxvX9wyTCjNb8162NbStnfE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XM+vqcsm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="XM+vqcsm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FD52C2BCB0; Tue, 12 May 2026 17:57:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778608636; bh=HYER1PsLHzwAXHRnM4sqWuvNUR4WqFRYyQDj76ClfKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XM+vqcsm0mr4+EQY72uoAJOHgK2cYZSzN/ZkRJB2td+ofEnrZzkKa3i5jUUiBYfQy 49ha63qnzotUv6KXv/dx4vdlUJEenZHC1ZZu+5pqPzysENUyYlV3JpjD6BvDJgNYrb Vk9G7LniNxLuJtHmqwiha4lHfrgGaxmH92uDOnS4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Biggers , Mikulas Patocka Subject: [PATCH 6.18 155/270] dm-verity-fec: correctly reject too-small hash devices Date: Tue, 12 May 2026 19:39:16 +0200 Message-ID: <20260512173941.712319289@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260512173938.452574370@linuxfoundation.org> References: <20260512173938.452574370@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Biggers commit 4355142245f7e55336dcc005ec03592df4d546f8 upstream. Fix verity_fec_ctr() to reject too-small hash devices by correctly taking hash_start into account. Note that this is necessary because dm-verity doesn't call dm_bufio_set_sector_offset() on the hash device's bufio client (v->bufio). Thus, dm_bufio_get_device_size(v->bufio) returns a size relative to 0 rather than hash_start. An alternative fix would be to call dm_bufio_set_sector_offset() on v->bufio, but then all the code that reads from the hash device would have to be adjusted accordingly. Fixes: a739ff3f543a ("dm verity: add support for forward error correction") Cc: stable@vger.kernel.org Signed-off-by: Eric Biggers Signed-off-by: Mikulas Patocka Signed-off-by: Greg Kroah-Hartman --- drivers/md/dm-verity-fec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/md/dm-verity-fec.c +++ b/drivers/md/dm-verity-fec.c @@ -720,7 +720,8 @@ int verity_fec_ctr(struct dm_verity *v) * it to be large enough. */ f->hash_blocks = f->blocks - v->data_blocks; - if (dm_bufio_get_device_size(v->bufio) < f->hash_blocks) { + if (dm_bufio_get_device_size(v->bufio) < + v->hash_start + f->hash_blocks) { ti->error = "Hash device is too small for " DM_VERITY_OPT_FEC_BLOCKS; return -E2BIG;