patch-testcases_kernel_syscalls_pkeys_pkey01_c 1.3 KB

1234567891011121314151617181920212223242526272829303132333435
  1. --- ltp-full-20190930.orig/testcases/kernel/syscalls/pkeys/pkey01.c 2019-09-30 13:30:26.000000000 +0200
  2. +++ ltp-full-20190930/testcases/kernel/syscalls/pkeys/pkey01.c 2019-10-29 15:02:09.524423510 +0100
  3. @@ -157,12 +157,12 @@ static void pkey_test(struct tcase *tc,
  4. buffer = SAFE_MMAP(NULL, size, mpa->prot, mpa->flags, fd, 0);
  5. - pkey = pkey_alloc(tc->flags, tc->access_rights);
  6. + pkey = ltp_pkey_alloc(tc->flags, tc->access_rights);
  7. if (pkey == -1)
  8. tst_brk(TBROK | TERRNO, "pkey_alloc failed");
  9. tst_res(TINFO, "Set %s on (%s) buffer", tc->name, flag_to_str(mpa->flags));
  10. - if (pkey_mprotect(buffer, size, mpa->prot, pkey) == -1)
  11. + if (ltp_pkey_mprotect(buffer, size, mpa->prot, pkey) == -1)
  12. tst_brk(TBROK | TERRNO, "pkey_mprotect failed");
  13. pid = SAFE_FORK();
  14. @@ -189,7 +189,7 @@ static void pkey_test(struct tcase *tc,
  15. tst_res(TFAIL, "Child: %s", tst_strstatus(status));
  16. tst_res(TINFO, "Remove %s from the buffer", tc->name);
  17. - if (pkey_mprotect(buffer, size, mpa->prot, 0x0) == -1)
  18. + if (ltp_pkey_mprotect(buffer, size, mpa->prot, 0x0) == -1)
  19. tst_brk(TBROK | TERRNO, "pkey_mprotect failed");
  20. switch (mpa->prot) {
  21. @@ -211,7 +211,7 @@ static void pkey_test(struct tcase *tc,
  22. SAFE_MUNMAP(buffer, size);
  23. - if (pkey_free(pkey) == -1)
  24. + if (ltp_pkey_free(pkey) == -1)
  25. tst_brk(TBROK | TERRNO, "pkey_free failed");
  26. }