tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[PATCH] Fix dmsetup table output change

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

authored by

Christophe Saout and committed by
Linus Torvalds 37af6560 c1b707d2

+3 -8
+3 -8
drivers/md/dm-crypt.c
··· 915 915 char *result, unsigned int maxlen) 916 916 { 917 917 struct crypt_config *cc = (struct crypt_config *) ti->private; 918 - const char *cipher; 919 - const char *chainmode = NULL; 920 918 unsigned int sz = 0; 921 919 922 920 switch (type) { ··· 923 925 break; 924 926 925 927 case STATUSTYPE_TABLE: 926 - cipher = crypto_blkcipher_name(cc->tfm); 927 - 928 - chainmode = cc->chainmode; 929 - 930 928 if (cc->iv_mode) 931 - DMEMIT("%s-%s-%s ", cipher, chainmode, cc->iv_mode); 929 + DMEMIT("%s-%s-%s ", cc->cipher, cc->chainmode, 930 + cc->iv_mode); 932 931 else 933 - DMEMIT("%s-%s ", cipher, chainmode); 932 + DMEMIT("%s-%s ", cc->cipher, cc->chainmode); 934 933 935 934 if (cc->key_size > 0) { 936 935 if ((maxlen - sz) < ((cc->key_size << 1) + 1))