d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

geli init with multiple providers - fix init and fix -B "none"

Browse Source 
Apply some fixes post rS336659, which allowed multiple provders to be
initialized in a single command.
- Fix issue where second and subsequent providers would fail init.
  This was due to the metadata struct being zeroed after the first
  provider init was completed, despite containing common data required
  for subsequent providers.
- Fix issue where -B "none" would still result in the metadata being
  backed-up if multiple providers had been specified. This was due to
  the backupfile of "none" being incorrectly made unique for each
  provider by appending "-<prov>".

Approved by:	asomers
Approved by:	re (gjb)
Differential Revision:	https://reviews.freebsd.org/D17096
This commit is contained in:
Ben Woods 2018-09-10 14:50:34 +00:00
parent 2c208ed867
commit e45068e3c9
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/geom/eli/geom_eli.c
View File

@ -888,29 +888,17 @@ eli_init(struct gctl_req *req)
/* Encrypt the first and the only Master Key. */
error = g_eli_mkey_encrypt(md.md_ealgo, key, md.md_keylen,
md.md_mkeys);
explicit_bzero(key, sizeof(key));
if (error != 0) {
gctl_error(r, "Cannot encrypt Master Key: %s.",
strerror(error));
goto out;
}
/*
* Convert metadata to on-disk format and then immediately erase
* sensitive data from the metadata struct.
*/
/* Convert metadata to on-disk format. */
eli_metadata_encode(&md, sector);
explicit_bzero(&md.md_provsize, sizeof(md.md_provsize));
explicit_bzero(&md.md_sectorsize, sizeof(md.md_sectorsize));
explicit_bzero(&md.md_salt, sizeof(md.md_salt));
explicit_bzero(&md.md_mkeys, sizeof(md.md_mkeys));
/*
* Store metadata to disk and then immediately erase sensitive
* data from memory.
*/
/* Store metadata to disk. */
error = g_metadata_store(prov, sector, sizeof(sector));
explicit_bzero(sector, sizeof(sector));
if (error != 0) {
gctl_error(r, "Cannot store metadata on %s: %s.", prov,
strerror(error));
@ -937,9 +925,11 @@ eli_init(struct gctl_req *req)
/* Backupfile given by the user, just copy it. */
strlcpy(backfile, str, sizeof(backfile));
/* Make the backup filename unique if multiple providers
* initialized in one command. */
if (nargs > 1) {
/* If multiple providers have been initialized in one
* command, and the backup filename has been specified
* as anything other than "none", make the backup
* filename unique for each provider. */
if (nargs > 1 && strcmp(backfile, "none") != 0) {
/*
* Replace first occurrence of "PROV" with
* provider name.
@ -999,11 +989,14 @@ eli_init(struct gctl_req *req)
gctl_free(r);
/*
* Erase sensitive data from memory, and ensure subsequent
* providers are initialized with unique metadata.
* Erase sensitive and provider specific data from memory.
*/
explicit_bzero(key, sizeof(key));
explicit_bzero(&md, sizeof(md));
explicit_bzero(sector, sizeof(sector));
explicit_bzero(&md.md_provsize, sizeof(md.md_provsize));
explicit_bzero(&md.md_sectorsize, sizeof(md.md_sectorsize));
explicit_bzero(&md.md_salt, sizeof(md.md_salt));
explicit_bzero(&md.md_mkeys, sizeof(md.md_mkeys));
}
/* Clear the cached metadata, including keys. */