[PATCH v17 09/24] selftests/vm/pkeys: Fix pkey_disable_clear()

[Sandipan Das]

From: Ram Pai <linux...@us.ibm.com>

Currently, pkey_disable_clear() sets the specified bits
instead clearing them. This has been dead code up to now
because its only callers i.e. pkey_access/write_allow()
are also unused.

cc: Dave Hansen <dave.han...@intel.com>
cc: Florian Weimer <fwei...@redhat.com>
Signed-off-by: Ram Pai <linux...@us.ibm.com>
Acked-by: Dave Hansen <dave.han...@intel.com>
Signed-off-by: Sandipan Das <sandi...@linux.ibm.com>
---
 tools/testing/selftests/vm/protection_keys.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/vm/protection_keys.c 
b/tools/testing/selftests/vm/protection_keys.c
index bed9d4de12b4..4b1ddb526228 100644
--- a/tools/testing/selftests/vm/protection_keys.c
+++ b/tools/testing/selftests/vm/protection_keys.c
@@ -418,7 +418,7 @@ void pkey_disable_clear(int pkey, int flags)
                        pkey, pkey, pkey_rights);
        pkey_assert(pkey_rights >= 0);
 
-       pkey_rights |= flags;
+       pkey_rights &= ~flags;
 
        ret = hw_pkey_set(pkey, pkey_rights, 0);
        shadow_pkey_reg = set_pkey_bits(shadow_pkey_reg, pkey, pkey_rights);
@@ -431,7 +431,7 @@ void pkey_disable_clear(int pkey, int flags)
        dprintf1("%s(%d) pkey_reg: 0x%016llx\n", __func__,
                        pkey, read_pkey_reg());
        if (flags)
-               assert(read_pkey_reg() > orig_pkey_reg);
+               assert(read_pkey_reg() < orig_pkey_reg);
 }
 
 void pkey_write_allow(int pkey)
-- 
2.17.1