Explorar el Código

totemknet: create_nozzle_device simplify check

ipaddr existence is checked for being not NULL by caller setup_nozzle.
Also ipaddr was passed to reparse_nozzle_ip_address function unchecked
so code would crash before reaching the actual check.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
Jan Friesse hace 6 años
padre
commit
9a0e7b584e
Se han modificado 1 ficheros con 3 adiciones y 5 borrados
  1. 3 5
      exec/totemknet.c

+ 3 - 5
exec/totemknet.c

@@ -1707,11 +1707,9 @@ static int create_nozzle_device(void *knet_context, const char *name,
 		goto out_clean;
 	}
 	knet_log_printf (LOGSYS_LEVEL_INFO, "Local nozzle IP address is %s / %d", parsed_ipaddr, atoi(prefix));
-	if (ipaddr) {
-		if (nozzle_add_ip(nozzle_dev, parsed_ipaddr, prefix) < 0) {
-			knet_log_printf (LOGSYS_LEVEL_ERROR, "Unable to add set nozzle IP addr to %s/%s: %s", parsed_ipaddr, prefix, strerror(errno));
-			goto out_clean;
-		}
+	if (nozzle_add_ip(nozzle_dev, parsed_ipaddr, prefix) < 0) {
+		knet_log_printf (LOGSYS_LEVEL_ERROR, "Unable to add set nozzle IP addr to %s/%s: %s", parsed_ipaddr, prefix, strerror(errno));
+		goto out_clean;
 	}
 
 	nozzle_fd = nozzle_get_fd(nozzle_dev);