Commit c13b5487 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Mike Snitzer

dm crypt: fix endianness annotations around org_sector_of_dmreq

The sector used here is a little endian value, so use the right
type for it.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent dc4060a5
...@@ -1034,11 +1034,11 @@ static u8 *org_iv_of_dmreq(struct crypt_config *cc, ...@@ -1034,11 +1034,11 @@ static u8 *org_iv_of_dmreq(struct crypt_config *cc,
return iv_of_dmreq(cc, dmreq) + cc->iv_size; return iv_of_dmreq(cc, dmreq) + cc->iv_size;
} }
static uint64_t *org_sector_of_dmreq(struct crypt_config *cc, static __le64 *org_sector_of_dmreq(struct crypt_config *cc,
struct dm_crypt_request *dmreq) struct dm_crypt_request *dmreq)
{ {
u8 *ptr = iv_of_dmreq(cc, dmreq) + cc->iv_size + cc->iv_size; u8 *ptr = iv_of_dmreq(cc, dmreq) + cc->iv_size + cc->iv_size;
return (uint64_t*) ptr; return (__le64 *) ptr;
} }
static unsigned int *org_tag_of_dmreq(struct crypt_config *cc, static unsigned int *org_tag_of_dmreq(struct crypt_config *cc,
...@@ -1074,7 +1074,7 @@ static int crypt_convert_block_aead(struct crypt_config *cc, ...@@ -1074,7 +1074,7 @@ static int crypt_convert_block_aead(struct crypt_config *cc,
struct bio_vec bv_out = bio_iter_iovec(ctx->bio_out, ctx->iter_out); struct bio_vec bv_out = bio_iter_iovec(ctx->bio_out, ctx->iter_out);
struct dm_crypt_request *dmreq; struct dm_crypt_request *dmreq;
u8 *iv, *org_iv, *tag_iv, *tag; u8 *iv, *org_iv, *tag_iv, *tag;
uint64_t *sector; __le64 *sector;
int r = 0; int r = 0;
BUG_ON(cc->integrity_iv_size && cc->integrity_iv_size != cc->iv_size); BUG_ON(cc->integrity_iv_size && cc->integrity_iv_size != cc->iv_size);
...@@ -1169,7 +1169,7 @@ static int crypt_convert_block_skcipher(struct crypt_config *cc, ...@@ -1169,7 +1169,7 @@ static int crypt_convert_block_skcipher(struct crypt_config *cc,
struct scatterlist *sg_in, *sg_out; struct scatterlist *sg_in, *sg_out;
struct dm_crypt_request *dmreq; struct dm_crypt_request *dmreq;
u8 *iv, *org_iv, *tag_iv; u8 *iv, *org_iv, *tag_iv;
uint64_t *sector; __le64 *sector;
int r = 0; int r = 0;
/* Reject unexpected unaligned bio. */ /* Reject unexpected unaligned bio. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment