apparmor: Fix wrong determination whether crun is confined #1409
Conversation
This file contains 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
flouthoc
approved these changes
Feb 1, 2024
idleroamer
force-pushed
the
nnp-confined
branch
from
8a767ae
to
7352464
Compare
giuseppe
reviewed
Feb 2, 2024
src/libcrun/utils.c
Outdated
| @@ -941,7 +941,7 @@ is_current_process_confined (libcrun_error_t *err) | |||
| if (UNLIKELY (bytes_read < 0)) | |||
| return crun_make_error (err, errno, "error reading file `%s`", attr_path); | |||
|
|
|||
| return (strncmp (buf, "unconfined", bytes_read) != 0 && buf[0] != '\0'); | |||
| return (strncmp (buf, "unconfined", 10) != 0); | |||
There was a problem hiding this comment.
it can use unitialized data.
We need to enforce bytes_read >= 10 and we could even use memcmp since we know the size, something like:
#define UNCONFINED "unconfined"
#define UNCONFINED_LEN (sizeof (UNCONFINED) - 1)
return bytes_read >= UNCONFINED_LEN && memcmp (buf, UNCONFINED, UNCONFINED_LEN));
There was a problem hiding this comment.
sounds much better :)
Thanks
|
@hswong3i what do you think about this 3rd option? :-) |
I could replace the patch to my OBS package and put my production server to death for a try 🤪 |
idleroamer
force-pushed
the
nnp-confined
branch
2 times, most recently
from
98deadd
to
278a23d
Compare
Closes: containers#1385 Signed-off-by: 😎Mostafa Emami <mustafaemami@gmail.com>
idleroamer
force-pushed
the
nnp-confined
branch
from
278a23d
to
cb3ffb5
Compare
|
@hswong3i please let us know if this solves your problem :-) |
hswong3i
added a commit
to alvistack/containers-crun
that referenced
this pull request
Feb 2, 2024
git clean -xdf
git submodule sync --recursive
git submodule update --recursive
git submodule foreach --recursive git clean -xdf
tar zcvf ../crun_1.14.orig.tar.gz --exclude=.git .
debuild -uc -us
cp crun.spec ../crun_1.14-1.spec
cp ../crun*1.14*.{gz,xz,spec,dsc} /osc/home\:alvistack/containers-crun-1.14/
rm -rf ../crun*1.14*.*
See containers#1405
See containers#1409
Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
Yes it works (alvistack@96cf21b and https://build.opensuse.org/package/show/home:alvistack/containers-crun-1.14): |
|
wonderful, let's merge it! |
hswong3i
added a commit
to alvistack/containers-crun
that referenced
this pull request
Feb 6, 2024
git clean -xdf
git submodule sync --recursive
git submodule update --recursive
git submodule foreach --recursive git clean -xdf
tar zcvf ../crun_1.14.orig.tar.gz --exclude=.git .
debuild -uc -us
cp crun.spec ../crun_1.14-1.spec
cp ../crun*1.14*.{gz,xz,spec,dsc} /osc/home\:alvistack/containers-crun-1.14/
rm -rf ../crun*1.14*.*
See containers#1405
See containers#1409
Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i
added a commit
to alvistack/containers-crun
that referenced
this pull request
Feb 9, 2024
git clean -xdf
git submodule sync --recursive
git submodule update --recursive
git submodule foreach --recursive git clean -xdf
tar zcvf ../crun_1.14.orig.tar.gz --exclude=.git .
debuild -uc -us
cp crun.spec ../crun_1.14-1.spec
cp ../crun*1.14*.{gz,xz,spec,dsc} /osc/home\:alvistack/containers-crun-1.14/
rm -rf ../crun*1.14*.*
See containers#1405
See containers#1409
Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
makes #1408 and #1406 unnecessary
Closes: #1385