Date:   Thu, 2 Dec 2021 14:07:56 -0800
From:   Eric Biggers <ebiggers@kernel.org>
To:     Mimi Zohar <zohar@linux.ibm.com>
Cc:     linux-integrity@vger.kernel.org, linux-fscrypt@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1 4/5] ima: support fs-verity file digest based
 signatures
Message-ID: <YalDvGjq0inMFKln@sol.localdomain>
References: <20211202215507.298415-1-zohar@linux.ibm.com>
 <20211202215507.298415-5-zohar@linux.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20211202215507.298415-5-zohar@linux.ibm.com>
Precedence: bulk

On Thu, Dec 02, 2021 at 04:55:06PM -0500, Mimi Zohar wrote:
>  	case IMA_VERITY_DIGSIG:
> -		fallthrough;
> +		set_bit(IMA_DIGSIG, &iint->atomic_flags);
> +
> +		/*
> +		 * The IMA signature is based on a hash of IMA_VERITY_DIGSIG
> +		 * and the fs-verity file digest, not directly on the
> +		 * fs-verity file digest.  Both digests should probably be
> +		 * included in the IMA measurement list, but for now this
> +		 * digest is only used for verifying the IMA signature.
> +		 */
> +		verity_digest[0] = IMA_VERITY_DIGSIG;
> +		memcpy(verity_digest + 1, iint->ima_hash->digest,
> +		       iint->ima_hash->length);
> +
> +		hash.hdr.algo = iint->ima_hash->algo;
> +		hash.hdr.length = iint->ima_hash->length;

This is still wrong because the bytes being signed don't include the hash
algorithm.  Unless you mean for it to be implicitly always SHA-256?  fs-verity
supports SHA-512 too, and it may support other hash algorithms in the future.

- Eric