Fix setfield/getfield

Check for versions >= feature version, not equal Bug: 13526708 Change-Id: Ie07f6334e6b7c5ca0d7f83ba00827a508e2c2963
10 years ago · 8561b5c9f5
parent f8e9569507
commit 8561b5c9f5
1 changed files with 4 additions and 2 deletions
--- a/cryptfs.c
+++ b/cryptfs.c
@ -516,7 +516,8 @@ static int load_persistent_data(void)
        return -1;
    }

-    if ((crypt_ftr.major_version != 1) || (crypt_ftr.minor_version != 1)) {
+    if ((crypt_ftr.major_version < 1)
+        || (crypt_ftr.major_version == 1 && crypt_ftr.minor_version < 1)) {
        SLOGE("Crypt_ftr version doesn't support persistent data");
        return -1;
    }
@ -597,7 +598,8 @@ static int save_persistent_data(void)
        return -1;
    }

-    if ((crypt_ftr.major_version != 1) || (crypt_ftr.minor_version != 1)) {
+    if ((crypt_ftr.major_version < 1)
+        || (crypt_ftr.major_version == 1 && crypt_ftr.minor_version < 1)) {
        SLOGE("Crypt_ftr version doesn't support persistent data");
        return -1;
    }