From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kW1V5-0005sB-Bv for mharc-grub-devel@gnu.org; Fri, 23 Oct 2020 14:09:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kW1V3-0005oH-58 for grub-devel@gnu.org; Fri, 23 Oct 2020 14:09:13 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:48747) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kW1V0-00068k-D7 for grub-devel@gnu.org; Fri, 23 Oct 2020 14:09:12 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 5DA851D0; Fri, 23 Oct 2020 14:09:08 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 23 Oct 2020 14:09:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm2; bh=Kt2Adp/Sb4Px4Tm0AE5fzLHBvxt EuoMwbwh1SOn9Tbk=; b=Ulp9fQS+V8k1EQ8VyxJaL7gGRC9baaZHfm40c5xAspM N6ZuJKkLXO8yWVtFoIqLaJbwXj9EGIt61v0JDgwLnNGWFjXiMxMajInzKn5pWj/6 /OP1DmkJiG5LFezN62qnwLAt3bL9ozlsTwp17b37jukXDCOLgQ99RHNN50LM1Jl1 MqP4sYQOD0pfYnr+9+sW8QDXraDTiY0ngup525yH7pOip38S5Fi/HD2F0hJl7R+m UNSJRlo7vgGdRqcQ+HXjMsmivJzkfe3a3CJc5OCt4XCI8vU/dPMSYay/bn0gS3Xz Qouno5Ol1dWcGa5WjoB5X5bFAipihOM6RpJdk4d6ufQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=Kt2Adp /Sb4Px4Tm0AE5fzLHBvxtEuoMwbwh1SOn9Tbk=; b=p7AqZ4KapJA1p2UNNQMXaa 88kRL/uAn2XCGifqvniP7wkBzrSKXSryxPgDlQIz7TMqiLY9KsIAc0cEpvnkmS1B Rol0rWN+F+Az1EIH8fzziYUrAHYfsQnx4M9ppPM4ng2zF5QrXJuGefqUiRQ2Z1lz HuFwMQW+qZ1O0kkqDQAaEQWkIJLvx1LQHoOWDIoMXYwDcocYy7r5O4Sio+2VgnzM bT5iYC1vfzIrmxQXzC/7hIf//y8K5LJKew58NZxaNvCIr3cLqkXn/0c7VWCvSluI Q+c5tGtuQIUjCNufZ11C7Trz/rqC3EokfiZq7PQebxdUnXBsUz6FfQJQWXuIHWEQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrkedtgdduvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepkeelrddugedrgeeirddvtddtnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-089-014-046-200.89.14.pool.telefonica.de [89.14.46.200]) by mail.messagingengine.com (Postfix) with ESMTPA id CDACE328005E; Fri, 23 Oct 2020 14:09:06 -0400 (EDT) Received: from localhost (tanuki [10.192.0.23]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 3ec41fa7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 23 Oct 2020 18:09:05 +0000 (UTC) Date: Fri, 23 Oct 2020 20:09:10 +0200 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v3 06/10] cryptodisk: Properly handle non-512 byte sized sectors. Message-ID: <20201023180910.GI810@tanuki> References: <20201009100122.GH2088@tanuki> <6fe26ba56862040d53b03d3d83f393e89156505b.1603148099.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="nEsDIrWrg+hrB7l1" Content-Disposition: inline In-Reply-To: <6fe26ba56862040d53b03d3d83f393e89156505b.1603148099.git.development@efficientek.com> Received-SPF: pass client-ip=64.147.123.20; envelope-from=ps@pks.im; helo=wout4-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/23 13:46:38 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Oct 2020 18:09:13 -0000 --nEsDIrWrg+hrB7l1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Oct 19, 2020 at 06:09:54PM -0500, Glenn Washburn wrote: > By default, dm-crypt internally uses an IV that corresponds to 512-byte > sectors, even when a larger sector size is specified. What this means is > that when using a larger sector size, the IV is incremented every sector. > However, the amount the IV is incremented is the number of 512 byte blocks > in a sector (ie 8 for 4K sectors). Confusingly the IV does not corespond = to > the number of, for example, 4K sectors. So each 512 byte cipher block in a > sector will be encrypted with the same IV and the IV will be incremented > afterwards by the number of 512 byte cipher blocks in the sector. >=20 > There are some encryption utilities which do it the intuitive way and have > the IV equal to the sector number regardless of sector size (ie. the fifth > sector would have an IV of 4 for each cipher block). And this is supported > by dm-crypt with the iv_large_sectors option and also cryptsetup as of 2.= 3.3 > with the --iv-large-sectors, though not with LUKS headers (only with --ty= pe > plain). However, support for this has not been included as grub does not > support plain devices right now. >=20 > One gotcha here is that the encrypted split keys are encrypted with a har= d- > coded 512-byte sector size. So even if your data is encrypted with 4K sec= tor > sizes, the split key encrypted area must be decrypted with a block size of > 512 (ie the IV increments every 512 bytes). This made these changes less > aestetically pleasing than desired. >=20 > Signed-off-by: Glenn Washburn > --- > grub-core/disk/cryptodisk.c | 52 ++++++++++++++++++++++--------------- > grub-core/disk/luks.c | 5 ++-- > grub-core/disk/luks2.c | 7 ++++- > include/grub/cryptodisk.h | 8 +++++- > 4 files changed, 47 insertions(+), 25 deletions(-) >=20 > diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c > index a3d672f68..623f0f396 100644 > --- a/grub-core/disk/cryptodisk.c > +++ b/grub-core/disk/cryptodisk.c > @@ -224,7 +224,8 @@ lrw_xor (const struct lrw_sector *sec, > static gcry_err_code_t > grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev, > grub_uint8_t * data, grub_size_t len, > - grub_disk_addr_t sector, int do_encrypt) > + grub_disk_addr_t sector, grub_size_t log_sector_size, > + int do_encrypt) > { > grub_size_t i; > gcry_err_code_t err; > @@ -237,7 +238,7 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *de= v, > return (do_encrypt ? grub_crypto_ecb_encrypt (dev->cipher, data, dat= a, len) > : grub_crypto_ecb_decrypt (dev->cipher, data, data, len)); > =20 > - for (i =3D 0; i < len; i +=3D (1U << dev->log_sector_size)) > + for (i =3D 0; i < len; i +=3D (1U << log_sector_size)) > { > grub_size_t sz =3D ((dev->cipher->cipher->blocksize > + sizeof (grub_uint32_t) - 1) > @@ -270,7 +271,7 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *de= v, > if (!ctx) > return GPG_ERR_OUT_OF_MEMORY; > =20 > - tmp =3D grub_cpu_to_le64 (sector << dev->log_sector_size); > + tmp =3D grub_cpu_to_le64 (sector << log_sector_size); > dev->iv_hash->init (ctx); > dev->iv_hash->write (ctx, dev->iv_prefix, dev->iv_prefix_len); > dev->iv_hash->write (ctx, &tmp, sizeof (tmp)); > @@ -281,14 +282,23 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *= dev, > } > break; > case GRUB_CRYPTODISK_MODE_IV_PLAIN64: > - iv[1] =3D grub_cpu_to_le32 (sector >> 32); > - /* FALLTHROUGH */ > case GRUB_CRYPTODISK_MODE_IV_PLAIN: > - iv[0] =3D grub_cpu_to_le32 (sector & 0xFFFFFFFF); > + /* > + * The IV is a 32 or 64 bit value of the dm-crypt native sector > + * number. If using 32 bit IV mode, zero out the most significant > + * 32 bits. > + */ > + { > + grub_uint64_t *iv64 =3D (grub_uint64_t *)iv; > + *iv64 =3D grub_cpu_to_le64 (sector << (log_sector_size > + - GRUB_CRYPTODISK_IV_LOG_SIZE)); > + if (dev->mode_iv =3D=3D GRUB_CRYPTODISK_MODE_IV_PLAIN) > + iv[1] =3D 0; > + } > break; > case GRUB_CRYPTODISK_MODE_IV_BYTECOUNT64: > - iv[1] =3D grub_cpu_to_le32 (sector >> (32 - dev->log_sector_size)); > - iv[0] =3D grub_cpu_to_le32 ((sector << dev->log_sector_size) > + iv[1] =3D grub_cpu_to_le32 (sector >> (32 - log_sector_size)); > + iv[0] =3D grub_cpu_to_le32 ((sector << log_sector_size) > & 0xFFFFFFFF); > break; > case GRUB_CRYPTODISK_MODE_IV_BENBI: > @@ -311,10 +321,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *= dev, > case GRUB_CRYPTODISK_MODE_CBC: > if (do_encrypt) > err =3D grub_crypto_cbc_encrypt (dev->cipher, data + i, data + i, > - (1U << dev->log_sector_size), iv); > + (1U << log_sector_size), iv); > else > err =3D grub_crypto_cbc_decrypt (dev->cipher, data + i, data + i, > - (1U << dev->log_sector_size), iv); > + (1U << log_sector_size), iv); > if (err) > return err; > break; > @@ -322,10 +332,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *= dev, > case GRUB_CRYPTODISK_MODE_PCBC: > if (do_encrypt) > err =3D grub_crypto_pcbc_encrypt (dev->cipher, data + i, data + i, > - (1U << dev->log_sector_size), iv); > + (1U << log_sector_size), iv); > else > err =3D grub_crypto_pcbc_decrypt (dev->cipher, data + i, data + i, > - (1U << dev->log_sector_size), iv); > + (1U << log_sector_size), iv); > if (err) > return err; > break; > @@ -337,7 +347,7 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *de= v, > if (err) > return err; > =20 > - for (j =3D 0; j < (1U << dev->log_sector_size); > + for (j =3D 0; j < (1U << log_sector_size); > j +=3D dev->cipher->cipher->blocksize) > { > grub_crypto_xor (data + i + j, data + i + j, iv, > @@ -368,11 +378,11 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *= dev, > if (do_encrypt) > err =3D grub_crypto_ecb_encrypt (dev->cipher, data + i,=20 > data + i, > - (1U << dev->log_sector_size)); > + (1U << log_sector_size)); > else > err =3D grub_crypto_ecb_decrypt (dev->cipher, data + i,=20 > data + i, > - (1U << dev->log_sector_size)); > + (1U << log_sector_size)); > if (err) > return err; > lrw_xor (&sec, dev, data + i); > @@ -381,10 +391,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *= dev, > case GRUB_CRYPTODISK_MODE_ECB: > if (do_encrypt) > err =3D grub_crypto_ecb_encrypt (dev->cipher, data + i, data + i, > - (1U << dev->log_sector_size)); > + (1U << log_sector_size)); > else > err =3D grub_crypto_ecb_decrypt (dev->cipher, data + i, data + i, > - (1U << dev->log_sector_size)); > + (1U << log_sector_size)); > if (err) > return err; > break; > @@ -399,9 +409,9 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *de= v, > gcry_err_code_t > grub_cryptodisk_decrypt (struct grub_cryptodisk *dev, > grub_uint8_t * data, grub_size_t len, > - grub_disk_addr_t sector) > + grub_disk_addr_t sector, grub_size_t log_sector_size) > { > - return grub_cryptodisk_endecrypt (dev, data, len, sector, 0); > + return grub_cryptodisk_endecrypt (dev, data, len, sector, log_sector_s= ize, 0); > } > =20 > grub_err_t > @@ -766,7 +776,7 @@ grub_cryptodisk_read (grub_disk_t disk, grub_disk_add= r_t sector, > } > gcry_err =3D grub_cryptodisk_endecrypt (dev, (grub_uint8_t *) buf, > size << disk->log_sector_size, > - sector, 0); > + sector, dev->log_sector_size, 0); > return grub_crypto_gcry_error (gcry_err); > } > =20 > @@ -807,7 +817,7 @@ grub_cryptodisk_write (grub_disk_t disk, grub_disk_ad= dr_t sector, > =20 > gcry_err =3D grub_cryptodisk_endecrypt (dev, (grub_uint8_t *) tmp, > size << disk->log_sector_size, > - sector, 1); > + sector, disk->log_sector_size, 1); > if (gcry_err) > { > grub_free (tmp); > diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c > index 59702067a..20cc20b9b 100644 > --- a/grub-core/disk/luks.c > +++ b/grub-core/disk/luks.c > @@ -124,7 +124,7 @@ configure_ciphers (grub_disk_t disk, const char *chec= k_uuid, > return NULL; > newdev->offset =3D grub_be_to_cpu32 (header.payloadOffset); > newdev->source_disk =3D NULL; > - newdev->log_sector_size =3D 9; > + newdev->log_sector_size =3D LUKS1_LOG_SECTOR_SIZE; > newdev->total_length =3D grub_disk_get_size (disk) - newdev->offset; > grub_memcpy (newdev->uuid, uuid, sizeof (uuid)); > newdev->modname =3D "luks"; > @@ -247,7 +247,8 @@ luks_recover_key (grub_disk_t source, > return err; > } > =20 > - gcry_err =3D grub_cryptodisk_decrypt (dev, split_key, length, 0); > + gcry_err =3D grub_cryptodisk_decrypt (dev, split_key, length, 0, > + LUKS1_LOG_SECTOR_SIZE); > if (gcry_err) > { > grub_free (split_key); > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index 311d18684..b9e0e98e1 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -500,7 +500,12 @@ luks2_decrypt_key (grub_uint8_t *out_key, > goto err; > } > =20 > - gcry_ret =3D grub_cryptodisk_decrypt (crypt, split_key, k->area.size, = 0); > + /* > + * The key slots area is always encrypted in 512-byte sectors, > + * regardless of encrypted data sector size. > + */ > + gcry_ret =3D grub_cryptodisk_decrypt (crypt, split_key, k->area.size, = 0, > + LUKS1_LOG_SECTOR_SIZE); > if (gcry_ret) > { > ret =3D grub_crypto_gcry_error (gcry_ret); > diff --git a/include/grub/cryptodisk.h b/include/grub/cryptodisk.h > index e1b21e785..006f3ec49 100644 > --- a/include/grub/cryptodisk.h > +++ b/include/grub/cryptodisk.h > @@ -48,6 +48,12 @@ typedef enum > =20 > #define GRUB_CRYPTODISK_MAX_UUID_LENGTH 71 > =20 > +/* LUKS1 specification defines the block size to always be 512 bytes. */ > +#define LUKS1_LOG_SECTOR_SIZE 9 Nit: This should probably be called `GRUB_LUKS1_LOG_SECTOR_SIZE`. Otherwise the patch looks good to me. Patrick > +/* By default dm-crypt increments the IV every 512 bytes. */ > +#define GRUB_CRYPTODISK_IV_LOG_SIZE 9 > + > #define GRUB_CRYPTODISK_GF_LOG_SIZE 7 > #define GRUB_CRYPTODISK_GF_SIZE (1U << GRUB_CRYPTODISK_GF_LOG_SIZE) > #define GRUB_CRYPTODISK_GF_LOG_BYTES (GRUB_CRYPTODISK_GF_LOG_SIZE - 3) > @@ -139,7 +145,7 @@ grub_cryptodisk_setkey (grub_cryptodisk_t dev, > gcry_err_code_t > grub_cryptodisk_decrypt (struct grub_cryptodisk *dev, > grub_uint8_t * data, grub_size_t len, > - grub_disk_addr_t sector); > + grub_disk_addr_t sector, grub_size_t log_sector_size); > grub_err_t > grub_cryptodisk_insert (grub_cryptodisk_t newdev, const char *name, > grub_disk_t source); > --=20 > 2.27.0 >=20 --nEsDIrWrg+hrB7l1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl+THEUACgkQVbJhu7ck PpRUkxAAkSjZZlNizncX5wkY02t9SB7Gk03uv0E3lOu0xQEmKy3nFDvK3b4qT6mJ xs9KmBpR5slR4+hebVYfILv6+wkPN6gTVEtJAhziLwGbZZVAt0PdB4mZc7GGkXA8 v0sa673DmbCFhf0IrWuugtcBWxFARPMipJqgBOjfCYWZMzj5YBSUTKDuakj5DPAX rk4J57y7lr0AnjJP3eSSg2XQ1lTT0hzhGGqgxX5XKJXPtx2L2E6tHeo9tHrDkOl8 dzu/gIxMRKcLqiY7lQqi1vDyRW1d7lgd9OpW5LvHg271kpsk4njrpTfSg0ZhUzyE DP2YeKd0CM+S0yzuxr9cbNnYQJ06W4oaM0DGlTG+W5df5aMALYBPncEpxb3rfZYH 7dTUCD8uswDKdYwnpmwqPU0VQcrZBVeExJ29mJR+pDwFsOi0t6fCwpSP3ceqQjIP 8dAYzHTgozQl6fHPgehuUwjTWuXuQbPvMR9XqKd4r6Jm+AzNtcVPjWhKTbWA1wLs dna3IbPAZ4n44MyDBGaTwklcOAEZNm0lVaJnl+mpe/s1bAg6KU4H3nogOJ8MEYmD NPm+OxucCeEnDomJueo7Q9ww0AyNETShCxVUvsPMsORX3vhfTuo4/moecthnNQ58 I/cbSijlXCJg6f8RWvMOV4f7jOWY4uUC04R57GQe+zvYdWJn4ZQ= =b7R5 -----END PGP SIGNATURE----- --nEsDIrWrg+hrB7l1--