On Thu, Mar 29, 2018 at 5:37 AM, Stephen Smalley <[email protected]> wrote: > On 03/28/2018 11:40 PM, Yuli Khodorkovskiy wrote: >> In permissive mode, calling restorecon with a bad label in file_contexts >> does not verify the label's existence in the loaded policy. This >> results in any label successfully applying to a file, as long as the >> file exists. >> >> This issue has two assumptions: >> >> 1) file_contexts must be manually updated with the invalid label. >> Running `semanage fcontext` will error when attempting to add >> an invalid label to file_contexts. >> 2) the system must be in permissive. Although applying an invalid label >> in enforcing gives an error and fails, successfully labeling a file with a >> bad label could cause issues during policy development in permissive. >> >> Instead, as each context is used, verify it is valid before blindly >> applying the label. If an error with validation occurs in restorecon, >> application of remaining valid labels will be uninterrupted as before. >> >> Signed-off-by: Yuli Khodorkovskiy <[email protected]> >> --- >> libselinux/src/label.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libselinux/src/label.c b/libselinux/src/label.c >> index 48f4d2d6..e642a97b 100644 >> --- a/libselinux/src/label.c >> +++ b/libselinux/src/label.c >> @@ -126,7 +126,7 @@ int selabel_validate(struct selabel_handle *rec, >> { >> int rc = 0; >> >> - if (!rec->validating || contexts->validated) >> + if (contexts->validated) >> goto out; >> >> rc = selinux_validate(&contexts->ctx_raw); >> > > label.c: In function ‘selabel_validate’: > label.c:124:45: error: unused parameter ‘rec’ [-Werror=unused-parameter] > int selabel_validate(struct selabel_handle *rec, > ^~~ > Need to drop the rec argument to selabel_validate() since it is no longer > used.
I figured with -Wall -Werror we would be good. For some reason, I can't reproduce with my ancient version of gcc. gcc versions 5 and above properly reports this. Weird.
