Skip to content

fsverity_test.go: fix nil pointer derefence, fix test fail, fix minor/major device numbers resolving#10972

Merged
samuelkarp merged 2 commits intocontainerd:mainfrom
xbt573:main
Nov 8, 2024
Merged

fsverity_test.go: fix nil pointer derefence, fix test fail, fix minor/major device numbers resolving#10972
samuelkarp merged 2 commits intocontainerd:mainfrom
xbt573:main

Conversation

@xbt573
Copy link
Contributor

@xbt573 xbt573 commented Nov 8, 2024

  1. Fix nil pointer dereference:

Nil pointer deference happens when IsEnabled returns false, nil and err.Error() is called on nil value.

  1. Fix test fail

Currently test fails when IsEnabled returns false, nil, i don't think it's fine (plus it only happens on one architecture, s390x), so i changed it to only accept false, err, or this test should also report false, nil?

  1. Fix minor/major device numbers resolving:

Taken from https://tip.golang.org/src/cmd/vendor/golang.org/x/sys/unix/dev_linux.go

Current formulas for resolving major/minor device numbers is incorrect, which leads to warnings like this:

=== RUN   TestEnable
    fsverity_test.go:51: invalid device: device mount not found for device id 3:0
--- SKIP: TestEnable (0.04s)
=== RUN   TestIsEnabled
--- PASS: TestIsEnabled (0.05s)
PASS

I also renamed variables a bit to fix conflict with built-in identifier min.

Tested on x86_64 and s390x (virtual machine) architectures.

Should fix #10971 too.

@k8s-ci-robot
Copy link

k8s-ci-robot commented Nov 8, 2024

Hi @xbt573. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@dosubot dosubot bot added the kind/bug label Nov 8, 2024
@samuelkarp
Copy link
Member

samuelkarp commented Nov 8, 2024

Your commits are missing the Signed-off-by trailer. Can you sign off on these commits so CI can run?

@samuelkarp
Copy link
Member

samuelkarp commented Nov 8, 2024 

  Running [/home/runner/golangci-lint-1.60.1-linux-arm64/golangci-lint run  --timeout=8m] in [/home/runner/work/containerd/containerd] ...
  internal/fsverity/fsverity_test.go:146: File is not `gofmt`-ed with `-s` (gofmt)
  	major := uint32((stat.Dev & 0x00000000000fff00) >> 8) | uint32((stat.Dev & 0xfffff00000000000) >> 32)
  	minor := uint32((stat.Dev & 0x00000000000000ff) >> 0) | uint32((stat.Dev & 0x00000ffffff00000) >> 12)

AkihiroSuda
AkihiroSuda reviewed Nov 8, 2024
View reviewed changes
@AkihiroSuda AkihiroSuda added the cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch label Nov 8, 2024
@samuelkarp
Copy link
Member

samuelkarp commented Nov 8, 2024

/ok-to-test

@estesp estesp added this pull request to the merge queue Nov 8, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 8, 2024
@dmcgowan dmcgowan added this pull request to the merge queue Nov 8, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 8, 2024
@samuelkarp samuelkarp added this pull request to the merge queue Nov 8, 2024
Merged via the queue into containerd:main with commit 0be529a Nov 8, 2024
@buckaroogeek
Copy link

buckaroogeek commented Nov 8, 2024

thank you!

@austinvazquez austinvazquez mentioned this pull request Nov 9, 2024
Merged
@estesp estesp added cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch and removed cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Nov 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@samuelkarp samuelkarp samuelkarp approved these changes

@estesp estesp estesp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch kind/bug ok-to-test size/S

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

v2.0.0 fsverity test failure on s390x (Fedora rawhide and F41)

7 participants

@xbt573 @k8s-ci-robot @samuelkarp @buckaroogeek @dmcgowan @estesp @AkihiroSuda