From: AliOS system security <alios_sys_security@linux.alibaba.com>
To: Alasdair Kergon <agk@redhat.com>, Mike Snitzer <snitzer@redhat.com>
Cc: dm-devel@redhat.com,
AliOS system security <alios_sys_security@linux.alibaba.com>
Subject: [PATCH] dm crypt: use unsigned long long instead of sector_t to store iv_offset
Date: Thu, 1 Nov 2018 16:53:59 +0800 [thread overview]
Message-ID: <1541062439-55558-1-git-send-email-alios_sys_security@linux.alibaba.com> (raw)
The iv_offset in the mapping table of crypt target is a 64bit number
when iv mode is plain64 or plain64be. It will be assigned to iv_offset of
struct crypt_config, cc_sector of struct convert_context and iv_sector of
struct dm_crypt_request. These structures members are defined as a sector_t.
But sector_t is 32bit when CONFIG_LBDAF is not set in 32bit kernel. In this
situation sector_t is not big enough to store the 64bit iv_offset.
Signed-off-by: AliOS system security <alios_sys_security@linux.alibaba.com>
---
drivers/md/dm-crypt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index b8eec51..49be7a6 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -49,7 +49,7 @@ struct convert_context {
struct bio *bio_out;
struct bvec_iter iter_in;
struct bvec_iter iter_out;
- sector_t cc_sector;
+ unsigned long long cc_sector;
atomic_t cc_pending;
union {
struct skcipher_request *req;
@@ -81,7 +81,7 @@ struct dm_crypt_request {
struct convert_context *ctx;
struct scatterlist sg_in[4];
struct scatterlist sg_out[4];
- sector_t iv_sector;
+ unsigned long long iv_sector;
};
struct crypt_config;
@@ -160,7 +160,7 @@ struct crypt_config {
struct iv_lmk_private lmk;
struct iv_tcw_private tcw;
} iv_gen_private;
- sector_t iv_offset;
+ unsigned long long iv_offset;
unsigned int iv_size;
unsigned short int sector_size;
unsigned char sector_shift;
--
2.7.4
next reply other threads:[~2018-11-01 8:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-01 8:53 AliOS system security [this message]
2018-11-01 20:06 ` dm crypt: use unsigned long long instead of sector_t to store iv_offset Mike Snitzer
2018-11-02 4:31 ` AliOS system security
2018-11-02 16:11 ` Mike Snitzer
2018-11-02 7:36 ` Milan Broz
2018-11-03 3:53 ` [PATCH] " AliOS system security
2018-11-04 13:39 ` Milan Broz
2018-11-05 7:31 ` [PATCH v2] dm crypt: use u64 " AliOS system security
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1541062439-55558-1-git-send-email-alios_sys_security@linux.alibaba.com \
--to=alios_sys_security@linux.alibaba.com \
--cc=agk@redhat.com \
--cc=dm-devel@redhat.com \
--cc=snitzer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox