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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 DD966C4724C for ; Mon, 4 May 2020 18:10:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B69A82496D for ; Mon, 4 May 2020 18:10:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615850; bh=G65lQelbqc4i5B5KqVbnSIKD0TuyLLjRWtqcJAfC5cs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bs+rApfeV3g5N512NNigZGnKYvfpqjqmqpR2h2nMqyVImGTz7FtksFv/vG6XkkAFx MV0x8qfPFq7pttt30rY3urDTwpwS6cn3UYhHy5NVoDsY2gnbaYKFvToCqKNBjcSf6h 29G+VTbcHj5IGgiN1K1jgT4E4nyaq4Z6ry3fQ4HM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731733AbgEDSEx (ORCPT ); Mon, 4 May 2020 14:04:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:34402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731124AbgEDSEu (ORCPT ); Mon, 4 May 2020 14:04:50 -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 644C4207DD; Mon, 4 May 2020 18:04:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615488; bh=G65lQelbqc4i5B5KqVbnSIKD0TuyLLjRWtqcJAfC5cs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vNANzQCtpCuMzRvVER2q83TWaSk7KeV1cH8Z33cpIgsGPaFV3I0vD8mWz1o7PBdFF b4gSgfrImx1WuS8BVLgp4mhcPCCKeDZA+Ookom8TUvruQ9vN0QzinS08rqYrKEfndt 18g40OHLN2kGJzd/0f4sFK+eEo299a63WKPyCNN8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sunwook Eom , Sami Tolvanen , Mike Snitzer Subject: [PATCH 5.4 30/57] dm verity fec: fix hash block number in verity_fec_decode Date: Mon, 4 May 2020 19:57:34 +0200 Message-Id: <20200504165458.958492332@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504165456.783676004@linuxfoundation.org> References: <20200504165456.783676004@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: Sunwook Eom commit ad4e80a639fc61d5ecebb03caa5cdbfb91fcebfc upstream. The error correction data is computed as if data and hash blocks were concatenated. But hash block number starts from v->hash_start. So, we have to calculate hash block number based on that. Fixes: a739ff3f543af ("dm verity: add support for forward error correction") Cc: stable@vger.kernel.org Signed-off-by: Sunwook Eom Reviewed-by: Sami Tolvanen Signed-off-by: Mike Snitzer Signed-off-by: Greg Kroah-Hartman --- drivers/md/dm-verity-fec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/md/dm-verity-fec.c +++ b/drivers/md/dm-verity-fec.c @@ -435,7 +435,7 @@ int verity_fec_decode(struct dm_verity * fio->level++; if (type == DM_VERITY_BLOCK_TYPE_METADATA) - block += v->data_blocks; + block = block - v->hash_start + v->data_blocks; /* * For RS(M, N), the continuous FEC data is divided into blocks of N