| Message ID | 20250402224148.435022-1-pvorel@suse.cz (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [COMMITTED] ima_violations.sh: Fix min kernel version for test4+ | expand |
On Thu, 2025-04-03 at 00:41 +0200, Petr Vorel wrote: > Although 79eb71fae5 claims test[4-8] require kernel 6.14, it's actually for 6.15. > 2 kernel commits were part of integrity-v6.15 and merged into mainline > as a2d4f473df11. They will be part of 6.15-rc1. > > While at it, document these kernel commits. > > Fixes: 79eb71fae5 ("ima_violations.sh: require kernel v6.14 for minimizing violations tests") > Signed-off-by: Petr Vorel <pvorel@suse.cz> > --- > Hi Mimi, all, > > I'm sorry not catching this: > https://lore.kernel.org/linux-integrity/174319448478.2953471.5705766506609559454.pr-tracker-bot@kernel.org/T/#t > > We got this because openSUSE Tumbleweed reached 6.14 few days ago. > Merged as > https://github.com/linux-test-project/ltp/commit/34e13f8a76e801b8f4c3444beed2ed358324066e > Thanks, Peter! > > .../kernel/security/integrity/ima/tests/ima_violations.sh | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/testcases/kernel/security/integrity/ima/tests/ima_violations.sh b/testcases/kernel/security/integrity/ima/tests/ima_violations.sh > index c6b929a233..1d2f1d9447 100755 > --- a/testcases/kernel/security/integrity/ima/tests/ima_violations.sh > +++ b/testcases/kernel/security/integrity/ima/tests/ima_violations.sh > @@ -5,6 +5,8 @@ > # Author: Mimi Zohar <zohar@linux.ibm.com> > # > # Test whether ToMToU and open_writer violations invalidatethe PCR and are logged. > +# test[4-6] test 6.15 commit 5b3cd801155f ("ima: limit the number of open-writers integrity violations") > +# test[7-8] test 6.15 commit a414016218ca ("ima: limit the number of ToMToU integrity violations") > > TST_SETUP="setup" > TST_CLEANUP="cleanup" > @@ -176,8 +178,8 @@ test4() > { > tst_res TINFO "verify limiting single open writer violation" > > - if tst_kvcmp -lt 6.14; then > - tst_brk TCONF "Minimizing violations requires kernel 6.14 or newer" > + if tst_kvcmp -lt 6.15; then > + tst_brk TCONF "Minimizing violations requires kernel 6.15 or newer" > fi > > local search="open_writers"
diff --git a/testcases/kernel/security/integrity/ima/tests/ima_violations.sh b/testcases/kernel/security/integrity/ima/tests/ima_violations.sh index c6b929a233..1d2f1d9447 100755 --- a/testcases/kernel/security/integrity/ima/tests/ima_violations.sh +++ b/testcases/kernel/security/integrity/ima/tests/ima_violations.sh @@ -5,6 +5,8 @@ # Author: Mimi Zohar <zohar@linux.ibm.com> # # Test whether ToMToU and open_writer violations invalidatethe PCR and are logged. +# test[4-6] test 6.15 commit 5b3cd801155f ("ima: limit the number of open-writers integrity violations") +# test[7-8] test 6.15 commit a414016218ca ("ima: limit the number of ToMToU integrity violations") TST_SETUP="setup" TST_CLEANUP="cleanup" @@ -176,8 +178,8 @@ test4() { tst_res TINFO "verify limiting single open writer violation" - if tst_kvcmp -lt 6.14; then - tst_brk TCONF "Minimizing violations requires kernel 6.14 or newer" + if tst_kvcmp -lt 6.15; then + tst_brk TCONF "Minimizing violations requires kernel 6.15 or newer" fi local search="open_writers"
Although 79eb71fae5 claims test[4-8] require kernel 6.14, it's actually for 6.15. 2 kernel commits were part of integrity-v6.15 and merged into mainline as a2d4f473df11. They will be part of 6.15-rc1. While at it, document these kernel commits. Fixes: 79eb71fae5 ("ima_violations.sh: require kernel v6.14 for minimizing violations tests") Signed-off-by: Petr Vorel <pvorel@suse.cz> --- Hi Mimi, all, I'm sorry not catching this: https://lore.kernel.org/linux-integrity/174319448478.2953471.5705766506609559454.pr-tracker-bot@kernel.org/T/#t We got this because openSUSE Tumbleweed reached 6.14 few days ago. Merged as https://github.com/linux-test-project/ltp/commit/34e13f8a76e801b8f4c3444beed2ed358324066e Kind regards, Petr .../kernel/security/integrity/ima/tests/ima_violations.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)