Merge pull request #11177 from opensourcerouting/fix/memset_memcpy

*: memcpy/memset zeroing

diff --cc bgpd/bgp_debug.c
index 7712274b58ba053b9d8e94dbf6e1a89c1b8e7495,ef71b191fa3deb546567b099705a81217d1d5f2e..57f37c173f6e38012431077c7b6fc6874c530d72
--- 1/bgpd/bgp_debug.c
--- 2/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@@ -639,30 -639,21 +639,30 @@@ static int bgp_debug_parse_evpn_prefix(
                return CMD_WARNING;
  
        if (evpn_type == BGP_EVPN_MAC_IP_ROUTE) {
-               memset(&ip, 0, sizeof(struct ipaddr));
+               memset(&ip, 0, sizeof(ip));
  
 -              argv_find(argv, argc, "mac", &mac_idx);
 -              (void)prefix_str2mac(argv[mac_idx + 1]->arg, &mac);
 +              if (argv_find(argv, argc, "mac", &mac_idx))
 +                      if (!prefix_str2mac(argv[mac_idx + 1]->arg, &mac)) {
 +                              vty_out(vty, "%% Malformed MAC address\n");
 +                              return CMD_WARNING;
 +                      }
  
 -              argv_find(argv, argc, "ip", &ip_idx);
 -              str2ipaddr(argv[ip_idx + 1]->arg, &ip);
 +              if (argv_find(argv, argc, "ip", &ip_idx))
 +                      if (str2ipaddr(argv[ip_idx + 1]->arg, &ip) != 0) {
 +                              vty_out(vty, "%% Malformed IP address\n");
 +                              return CMD_WARNING;
 +                      }
  
                build_evpn_type2_prefix((struct prefix_evpn *)argv_p,
                                        &mac, &ip);
        } else if (evpn_type == BGP_EVPN_IMET_ROUTE) {
-               memset(&ip, 0, sizeof(struct ipaddr));
+               memset(&ip, 0, sizeof(ip));
  
 -              argv_find(argv, argc, "ip", &ip_idx);
 -              str2ipaddr(argv[ip_idx + 1]->arg, &ip);
 +              if (argv_find(argv, argc, "ip", &ip_idx))
 +                      if (str2ipaddr(argv[ip_idx + 1]->arg, &ip) != 0) {
 +                              vty_out(vty, "%% Malformed IP address\n");
 +                              return CMD_WARNING;
 +                      }
  
                build_evpn_type3_prefix((struct prefix_evpn *)argv_p,
                                        ip.ipaddr_v4);

diff --cc bgpd/bgp_evpn_mh.c
Simple merge

diff --cc bgpd/bgp_evpn_vty.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge