]> git.ipfire.org Git - pakfire.git/commitdiff
linter: Fix RELRO check
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 31 Dec 2024 13:37:42 +0000 (13:37 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 31 Dec 2024 13:37:42 +0000 (13:37 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/linter-file.c

index bbf16ee82af9f5492c29c2dde426bacf62f307fd..b8af528fff11b443017ad68752cd0cb593f2cb8a 100644 (file)
@@ -631,9 +631,9 @@ static int pakfire_linter_file_check_relro(struct pakfire_linter_file* lfile) {
        if (r)
                return r;
 
-       // We are not fully RELRO
-       if (!has_bind_now)
-               return pakfire_linter_file_error(lfile, "Is not fully RELRO");
+       // We are fully RELRO
+       if (has_bind_now)
+               return 0;
 
        // Walk through all program headers
        for (unsigned int i = 0;; i++) {
@@ -642,10 +642,7 @@ static int pakfire_linter_file_check_relro(struct pakfire_linter_file* lfile) {
 
                switch (phdr.p_type) {
                        case PT_GNU_RELRO:
-                               r = pakfire_linter_file_warning(lfile, "Is partially RELRO");
-                               if (r < 0)
-                                       return 0;
-                               break;
+                               return pakfire_linter_file_warning(lfile, "Is partially RELRO");
 
                        default:
                                break;
@@ -653,7 +650,7 @@ static int pakfire_linter_file_check_relro(struct pakfire_linter_file* lfile) {
        }
 
        // This file does not seem to have PT_GNU_RELRO set
-       return pakfire_linter_file_error(lfile, "Is not fully RELRO");
+       return pakfire_linter_file_error(lfile, "Is not RELRO");
 }
 
 /*