Merge pull request #2075 from wenningerk/2.0-prepare-2.0.4

2.0 prepare 2.0.4

.gitignore

@@ -148,7 +148,7 @@ publican.cfg
 /doc/sphinx/*/_build
 /doc/sphinx/*/conf.py
 /lib/common/md5.c
-/maint/testcc
+/maint/testcc_*_h
 /maint/mocked/based
 scratch
 /tools/attrd_updater

daemons/execd/execd_alerts.c

@@ -93,7 +93,8 @@ process_lrmd_alert_exec(pcmk__client_t *client, uint32_t id, xmlNode *request)
     GHashTable *params = NULL;
     struct alert_cb_s *cb_data = NULL;
 
-    if ((alert_id == NULL) || (alert_path == NULL)) {
+    if ((alert_id == NULL) || (alert_path == NULL) ||
+        (client == NULL) || (client->id == NULL)) { /* hint static analyzer */
         return -EINVAL;
     }
     if (draining_alerts) {
@@ -112,6 +113,7 @@ process_lrmd_alert_exec(pcmk__client_t *client, uint32_t id, xmlNode *request)
     CRM_CHECK(cb_data != NULL,
               rc = -ENOMEM; goto err);
 
+    /* coverity[deref_ptr] False Positive */
     cb_data->client_id = strdup(client->id);
     CRM_CHECK(cb_data->client_id != NULL,
               rc = -ENOMEM; goto err);

daemons/fenced/fenced_remote.c

@@ -1838,6 +1838,8 @@ add_result(remote_fencing_op_t *op, const char *host, int ndevices, xmlNode *xml
     st_query_result_t *result = calloc(1, sizeof(st_query_result_t));
     xmlNode *child;
 
+    // cppcheck seems not to understand the abort logic in CRM_CHECK
+    // cppcheck-suppress memleak
     CRM_CHECK(result != NULL, return NULL);
     result->host = strdup(host);
     result->devices = crm_str_table_new();

lib/cluster/cpg.c

@@ -740,6 +740,8 @@ send_cluster_text(enum crm_ais_msg_class msg_class, const char *data,
             msg->compressed_size = new_size;
 
         } else {
+            // cppcheck seems not to understand the abort logic in realloc_safe
+            // cppcheck-suppress memleak
             msg = realloc_safe(msg, msg->header.size);
             memcpy(msg->data, data, msg->size);
         }

lib/common/cmdline.c

@@ -154,7 +154,10 @@ pcmk__cmdline_preproc(char **argv, const char *special) {
     }
 
     if (g_get_prgname() == NULL && argv && *argv) {
-        g_set_prgname(g_path_get_basename(*argv));
+        gchar *basename = g_path_get_basename(*argv);
+
+        g_set_prgname(basename);
+        g_free(basename);
     }
 
     arr = g_ptr_array_new();

lib/common/io.c

@@ -48,6 +48,8 @@ pcmk__build_path(const char *path_c, mode_t mode)
     int rc = pcmk_rc_ok;
     char *path = strdup(path_c);
 
+    // cppcheck seems not to understand the abort logic in CRM_CHECK
+    // cppcheck-suppress memleak
     CRM_CHECK(path != NULL, return -ENOMEM);
     for (len = strlen(path); offset < len; offset++) {
         if (path[offset] == '/') {

lib/common/ipc.c

@@ -787,7 +787,7 @@ pcmk__ipc_prepare_iov(uint32_t request, xmlNode *message,
 
     header = calloc(1, sizeof(struct crm_ipc_response_header));
     if (header == NULL) {
-        return errno;
+        return ENOMEM; /* errno mightn't be set by allocator */
     }
 
     buffer = dump_xml_unformatted(message);

lib/common/logging.c

@@ -942,6 +942,8 @@ crm_log_args(int argc, char **argv)
 
     logged = 1;
 
+    // cppcheck seems not to understand the abort logic in realloc_safe
+    // cppcheck-suppress memleak
     for (; lpc < argc; lpc++) {
         if (argv[lpc] == NULL) {
             break;

lib/common/options.c

@@ -64,6 +64,8 @@ create_long_opts(pcmk__cli_option_t *long_options)
     long_opts[index].val = '_';
     index++;
 
+    // cppcheck seems not to understand the abort-logic in realloc_safe
+    // cppcheck-suppress memleak
     for (lpc = 0; long_options[lpc].name != NULL; lpc++) {
         if (long_options[lpc].name[0] == '-') {
             continue;

lib/common/remote.c

@@ -1019,6 +1019,8 @@ connect_socket_retry(int sock, const struct sockaddr *addr, socklen_t addrlen,
         *timer_id = timer;
     }
 
+    // timer callback should be taking care of cb_data
+    // cppcheck-suppress memleak
     return pcmk_rc_ok;
 }
 

lib/common/xml.c

@@ -2292,6 +2292,8 @@ decompress_file(const char *filename)
     }
 
     rc = BZ_OK;
+    // cppcheck seems not to understand the abort-logic in realloc_safe
+    // cppcheck-suppress memleak
     while (rc == BZ_OK) {
         buffer = realloc_safe(buffer, XML_BUFFER_SIZE + length + 1);
         read_len = BZ2_bzRead(&rc, bz_file, buffer + length, XML_BUFFER_SIZE);
@@ -3223,7 +3225,8 @@ crm_xml_dump(xmlNode * data, int options, char **buffer, int *offset, int *max,
 
         xmlNodeDumpOutput(xml_buffer, doc, data, 0,
                           (options & xml_log_option_formatted), NULL);
-        xmlOutputBufferWrite(xml_buffer, sizeof("\n") - 1, "\n");  /* final NL */
+        /* attempt adding final NL - failing shouldn't be fatal here */
+        (void) xmlOutputBufferWrite(xml_buffer, sizeof("\n") - 1, "\n");
         if (xml_buffer->buffer != NULL) {
             buffer_print(*buffer, *max, *offset, "%s",
                          (char *) xmlBufContent(xml_buffer->buffer));
@@ -3237,7 +3240,8 @@ crm_xml_dump(xmlNode * data, int options, char **buffer, int *offset, int *max,
         }
 #endif
 
-        xmlOutputBufferClose(xml_buffer);
+        /* asserted allocation before so there should be something to remove */
+        (void) xmlOutputBufferClose(xml_buffer);
         return;
     }
 

lib/fencing/st_client.c

@@ -418,6 +418,8 @@ create_level_registration_xml(const char *node, const char *pattern,
         crm_xml_add(data, XML_ATTR_STONITH_TARGET_VALUE, value);
     }
 
+    // cppcheck seems not to understand the abort logic behind realloc_safe
+    // cppcheck-suppress memleak
     for (; device_list; device_list = device_list->next) {
 
         int adding = strlen(device_list->value);

lib/gnu/md5.c

@@ -299,10 +299,13 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
       if (left_over >= 64)
         {
           md5_process_block (ctx->buffer, 64, ctx);
-          left_over -= 64;
+          left_over &= 63; /* same as -= 64 but easier to understand
+                              for static analysis
+                            */
           /* The regions in the following copy operation cannot overlap,
              because left_over ≤ 64.  */
-          memcpy (ctx->buffer, &ctx->buffer[16], left_over);
+          memcpy (ctx->buffer, &(((char *) ctx->buffer)[64]), left_over);
+          /* cast to char * as hint for static analysis */
         }
       ctx->buflen = left_over;
     }

lib/pacemaker/pcmk_sched_clone.c

@@ -383,7 +383,11 @@ can_run_instance(pe_resource_t * rsc, pe_node_t * node, int limit)
         return NULL;
     }
 
-    if (can_run_resources(node) == FALSE) {
+    if (!node) {
+        /* make clang analyzer happy */
+        goto bail;
+
+    } else if (can_run_resources(node) == FALSE) {
         goto bail;
 
     } else if (is_set(rsc->flags, pe_rsc_orphan)) {
@@ -1402,9 +1406,11 @@ probe_anonymous_clone(pe_resource_t *rsc, pe_node_t *node,
             pe_node_t *local_node = NULL;
             pe_resource_t *child_rsc = (pe_resource_t *) child_iter->data;
 
-            local_node = child_rsc->fns->location(child_rsc, NULL, FALSE);
-            if (local_node && (local_node->details == node->details)) {
-                child = child_rsc;
+            if (child_rsc) { /* make clang analyzer happy */
+                local_node = child_rsc->fns->location(child_rsc, NULL, FALSE);
+                if (local_node && (local_node->details == node->details)) {
+                    child = child_rsc;
+                }
             }
         }
     }
@@ -1413,6 +1419,7 @@ probe_anonymous_clone(pe_resource_t *rsc, pe_node_t *node,
     if (child == NULL) {
         child = rsc->children->data;
     }
+    CRM_ASSERT(child);
     return child->cmds->create_probe(child, node, complete, force, data_set);
 }
 

lib/pacemaker/pcmk_sched_graph.c

@@ -1257,7 +1257,8 @@ action2xml(pe_action_t * action, gboolean as_input, pe_working_set_t *data_set)
             hash2smartfield((gpointer)"pcmk_external_ip", (gpointer)value, (gpointer)args_xml);
         }
 
-        if (pe__is_guest_node(action->node)) {
+        if (action->node && /* make clang analyzer happy */
+            pe__is_guest_node(action->node)) {
             pe_node_t *host = NULL;
             enum action_tasks task = text2task(action->task);
 

replace/scandir.c

@@ -152,11 +152,15 @@ scandir(const char *directory_name,
 
     /* Get initial list space and open directory.  */
 
-    if (directory = opendir(directory_name), directory == NULL)
+    if ((directory = opendir(directory_name)) == NULL) {
         return -1;
+    }
 
-    if ((array = (struct dirent **)malloc(allocated * sizeof(struct dirent *))) == NULL)
+    if ((array = (struct dirent **)malloc(allocated * sizeof(struct dirent *)))
+        == NULL) {
+        closedir(directory);
         return -1;
+    }
 
     /* Read entries in the directory.  */
 

rpm/pacemaker.spec.in

@@ -1,3 +1,32 @@
+# Define conditionals so that "rpmbuild --with <feature>" and
+# "rpmbuild --without <feature>" can enable and disable specific features
+
+## Add option to enable support for stonith/external fencing agents
+%bcond_with stonithd
+
+## Add option to create binaries suitable for use with profiling tools
+%bcond_with profiling
+
+## Add option to create binaries with coverage analysis
+%bcond_with coverage
+
+## Add option to skip generating documentation
+## (the build tools aren't available everywhere)
+%bcond_without doc
+
+## Add option to prefix package version with "0."
+## (so later "official" packages will be considered updates)
+%bcond_with pre_release
+
+## Add option to ship Upstart job files
+%bcond_with upstart_job
+
+## Add option to turn off hardening of libraries and daemon executables
+%bcond_without hardening
+
+## Add option to disable links for legacy daemon names
+%bcond_without legacy_links
+
 # Globals and defines to control package behavior (configure these as desired)
 
 ## User and group to use for nonprivileged services
@@ -177,37 +206,6 @@
 }
 %endif
 
-
-# Define conditionals so that "rpmbuild --with <feature>" and
-# "rpmbuild --without <feature>" can enable and disable specific features
-
-## Add option to enable support for stonith/external fencing agents
-%bcond_with stonithd
-
-## Add option to create binaries suitable for use with profiling tools
-%bcond_with profiling
-
-## Add option to create binaries with coverage analysis
-%bcond_with coverage
-
-## Add option to skip generating documentation
-## (the build tools aren't available everywhere)
-%bcond_without doc
-
-## Add option to prefix package version with "0."
-## (so later "official" packages will be considered updates)
-%bcond_with pre_release
-
-## Add option to ship Upstart job files
-%bcond_with upstart_job
-
-## Add option to turn off hardening of libraries and daemon executables
-%bcond_without hardening
-
-## Add option to disable links for legacy daemon names
-%bcond_without legacy_links
-
-
 # Keep sane profiling data if requested
 %if %{with profiling}
 

tools/crm_error.c

@@ -129,7 +129,7 @@ main(int argc, char **argv)
         if (g_strv_length(processed_args) < 2) {
             char *help = g_option_context_get_help(context, TRUE, NULL);
             fprintf(stderr, "%s", help);
-            free(help);
+            g_free(help);
             return CRM_EX_USAGE;
         }
 

tools/crm_mon.c

@@ -340,6 +340,7 @@ as_html_cb(const gchar *option_name, const gchar *optarg, gpointer data, GError
 
     if (args->output_dest != NULL) {
         free(args->output_dest);
+        args->output_dest = NULL;
     }
 
     if (optarg != NULL) {
@@ -1465,6 +1466,7 @@ print_simple_status(pcmk__output_t *out, pe_working_set_t * data_set,
             nodes_online++;
         } else {
             char *s = crm_strdup_printf("offline node: %s", node->details->uname);
+            /* coverity[leaked_storage] False positive */
             offline_nodes = pcmk__add_word(offline_nodes, s);
             free(s);
             mon_ops |= mon_op_has_warnings;
@@ -1503,6 +1505,7 @@ print_simple_status(pcmk__output_t *out, pe_working_set_t * data_set,
         free(nodes_standby_s);
         free(nodes_maint_s);
     }
+    /* coverity[leaked_storage] False positive */
 }
 
 /*!

tools/crm_resource.c

@@ -644,9 +644,9 @@ main(int argc, char **argv)
     const char *operation = NULL;
     const char *interval_spec = NULL;
     const char *cib_file = getenv("CIB_file");
+    const char *xml_file = NULL;
     GHashTable *override_params = NULL;
 
-    char *xml_file = NULL;
     xmlNode *cib_xml_copy = NULL;
     pe_resource_t *rsc = NULL;
     bool recursive = FALSE;
@@ -844,7 +844,7 @@ main(int argc, char **argv)
                 pcmk__cli_help(flag, CRM_EX_OK);
                 break;
             case 'x':
-                xml_file = strdup(optarg);
+                xml_file = optarg;
                 break;
             case 'Q':
                 BE_QUIET = TRUE;
@@ -1111,7 +1111,6 @@ main(int argc, char **argv)
     if (require_dataset) {
         if (xml_file != NULL) {
             cib_xml_copy = filename2xml(xml_file);
-
         } else {
             rc = cib_conn->cmds->query(cib_conn, NULL, &cib_xml_copy, cib_scope_local | cib_sync_call);
         }

tools/crm_ticket.c

@@ -41,8 +41,8 @@ const char *attr_value = NULL;
 const char *attr_id = NULL;
 const char *set_name = NULL;
 const char *attr_default = NULL;
+const char *xml_file = NULL;
 char ticket_cmd = 'S';
-char *xml_file = NULL;
 int cib_options = cib_sync_call;
 
 static pe_ticket_t *
@@ -812,7 +812,7 @@ main(int argc, char **argv)
                 do_force = TRUE;
                 break;
             case 'x':
-                xml_file = strdup(optarg);
+                xml_file = optarg;
                 break;
             case 'n':
                 set_name = optarg;