netlabel: remove unused param from audit_log_format()
authorAlex Dewar <alex.dewar90@gmail.com>
Fri, 28 Aug 2020 13:55:23 +0000 (14:55 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Aug 2020 16:08:51 +0000 (09:08 -0700)
Commit d3b990b7f327 ("netlabel: fix problems with mapping removal")
added a check to return an error if ret_val != 0, before ret_val is
later used in a log message. Now it will unconditionally print "...
res=1". So just drop the check.

Addresses-Coverity: ("Dead code")
Fixes: d3b990b7f327 ("netlabel: fix problems with mapping removal")
Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netlabel/netlabel_domainhash.c

index d07de2c..38aaead 100644 (file)
@@ -600,9 +600,8 @@ int netlbl_domhsh_remove_entry(struct netlbl_dom_map *entry,
        audit_buf = netlbl_audit_start_common(AUDIT_MAC_MAP_DEL, audit_info);
        if (audit_buf != NULL) {
                audit_log_format(audit_buf,
-                                " nlbl_domain=%s res=%u",
-                                entry->domain ? entry->domain : "(default)",
-                                ret_val == 0 ? 1 : 0);
+                                " nlbl_domain=%s res=1",
+                                entry->domain ? entry->domain : "(default)");
                audit_log_end(audit_buf);
        }