devices: correctly check device types#2529
Merged
cyphar merged 1 commit intoopencontainers:masterfrom Jul 29, 2020
cyphar:devices-filemode
Merged
devices: correctly check device types#2529cyphar merged 1 commit intoopencontainers:masterfrom cyphar:devices-filemode
cyphar merged 1 commit intoopencontainers:masterfrom
cyphar:devices-filemode
Conversation
Member
|
Can we have rc92 right after merging this? |
Member
Author
|
Sure, especially since this breaks Docker. |
AkihiroSuda
reviewed
Jul 28, 2020
|
Thanks! |
AkihiroSuda
reviewed
Jul 28, 2020
(mode&S_IFCHR == S_IFCHR) is the wrong way of checking the type of an inode because the S_IF* bits are actually not a bitmask and instead must be checked using S_IF*. This bug was neatly hidden behind a (major == 0) sanity-check but that was removed by [1]. In addition, add a test that makes sure that HostDevices() doesn't give rubbish results -- because we broke this and fixed this before[2]. [1]: 24388be ("configs: use different types for .Devices and .Resources.Devices") [2]: 3ed492a ("Handle non-devices correctly in DeviceFromPath") Fixes: b0d014d ("libcontainer: one more switch from syscall to x/sys/unix") Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
AkihiroSuda
approved these changes
Jul 28, 2020
Member
|
Thanks @cyphar 👍 |
mrunalp
approved these changes
Jul 28, 2020
This was referenced Dec 1, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
(mode&S_IFCHR == S_IFCHR) is the wrong way of checking the type of an
inode because the S_IF* bits are actually not a bitmask and instead must
be checked using S_IF*. This bug was neatly hidden behind a (major == 0)
sanity-check but that was removed by me[1].
In addition, add a test that makes sure that HostDevices() doesn't give
rubbish results -- because we broke this and fixed this before[2].
[1] 24388be ("configs: use different types for .Devices and .Resources.Devices")
[2] 3ed492a ("Handle non-devices correctly in DeviceFromPath")
Fixes: b0d014d ("libcontainer: one more switch from syscall to x/sys/unix")
Signed-off-by: Aleksa Sarai cyphar@cyphar.com