diff options
| author | Badhri Jagan Sridharan <Badhri@google.com> | 2016-09-27 13:48:29 -0700 |
|---|---|---|
| committer | Vikram Mulukutla <markivx@codeaurora.org> | 2016-10-28 14:49:17 -0700 |
| commit | 590c510b921118c8c790560746253c823f10c027 (patch) | |
| tree | 0e17f84ff1a35abb56473ee091ea34d87f408b9b | |
| parent | 79e1ba0e5cf92b60476124a1e7041eefcac3b701 (diff) | |
ANDROID: dm: android-verity: Remove fec_header location constraint
This CL removes the mandate of the fec_header being located right
after the ECC data.
(Cherry-picked from https://android-review.googlesource.com/#/c/280401)
Bug: 28865197
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Change-Id: Ie04c8cf2dd755f54d02dbdc4e734a13d6f6507b5
Git-commit: 1daecfe215ea3379fdc842f264607d37dd8fe091
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
| -rw-r--r-- | drivers/md/dm-android-verity.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/md/dm-android-verity.c b/drivers/md/dm-android-verity.c index 15ce2a81c1f4..bb6c1285e499 100644 --- a/drivers/md/dm-android-verity.c +++ b/drivers/md/dm-android-verity.c @@ -266,10 +266,7 @@ static inline int validate_fec_header(struct fec_header *header, u64 offset) le32_to_cpu(header->version) != FEC_VERSION || le32_to_cpu(header->size) != sizeof(struct fec_header) || le32_to_cpu(header->roots) == 0 || - le32_to_cpu(header->roots) >= FEC_RSM || - offset < le32_to_cpu(header->fec_size) || - offset - le32_to_cpu(header->fec_size) != - le64_to_cpu(header->inp_size)) + le32_to_cpu(header->roots) >= FEC_RSM) return -EINVAL; return 0; |