kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] Fix dmsetup table output change

Browse source 
Fix dm-crypt after the block cipher API changes to correctly return the
backwards compatible cipher-chainmode[-ivmode] format for "dmsetup
table".

Signed-off-by: Christophe Saout <christophe@saout.de>
Cc: Alasdair G Kergon <agk@redhat.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff linux-2.6.19-rc3.orig/drivers/md/dm-crypt.c linux-2.6.19-rc3/drivers/md/dm-crypt.c
This commit is contained in:
Christophe Saout 2006-10-30 20:39:08 +01:00 committed by Linus Torvalds
parent c1b707d253
commit 37af6560f7
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/md/dm-crypt.c
View file

@ -915,8 +915,6 @@ static int crypt_status(struct dm_target *ti, status_type_t type,
char *result, unsigned int maxlen) char *result, unsigned int maxlen)
{ {
struct crypt_config *cc = (struct crypt_config *) ti->private; struct crypt_config *cc = (struct crypt_config *) ti->private;
const char *cipher;
const char *chainmode = NULL;
unsigned int sz = 0; unsigned int sz = 0;
switch (type) { switch (type) {
@ -925,14 +923,11 @@ static int crypt_status(struct dm_target *ti, status_type_t type,
break; break;
case STATUSTYPE_TABLE: case STATUSTYPE_TABLE:
cipher = crypto_blkcipher_name(cc->tfm);
chainmode = cc->chainmode;
if (cc->iv_mode) if (cc->iv_mode)
DMEMIT("%s-%s-%s ", cipher, chainmode, cc->iv_mode); DMEMIT("%s-%s-%s ", cc->cipher, cc->chainmode,
cc->iv_mode);
else else
DMEMIT("%s-%s ", cipher, chainmode); DMEMIT("%s-%s ", cc->cipher, cc->chainmode);
if (cc->key_size > 0) { if (cc->key_size > 0) {
if ((maxlen - sz) < ((cc->key_size << 1) + 1)) if ((maxlen - sz) < ((cc->key_size << 1) + 1))