*: Properly use memset() when zeroing

[mirror_frr.git] / zebra / ioctl.c

diff --git a/zebra/ioctl.c b/zebra/ioctl.c
index a895ed941005036a98a7e7f3de693c5d8a6fca2c..facd8e318d8620848d2f54f169f3d7fb3dc7bf50 100644 (file)
--- a/zebra/ioctl.c
+++ b/zebra/ioctl.c
@@ -242,7 +242,7 @@ static int if_set_prefix_ctx(const struct zebra_dplane_ctx *ctx)
        strlcpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx),
                sizeof(addreq.ifra_name));
 
-       memset(&addr, 0, sizeof(struct sockaddr_in));
+       memset(&addr, 0, sizeof(addr));
        addr.sin_addr = p->prefix;
        addr.sin_family = p->family;
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
@@ -252,7 +252,7 @@ static int if_set_prefix_ctx(const struct zebra_dplane_ctx *ctx)
 
        if (dplane_ctx_intf_is_connected(ctx)) {
                p = (struct prefix_ipv4 *)dplane_ctx_get_intf_dest(ctx);
-               memset(&mask, 0, sizeof(struct sockaddr_in));
+               memset(&mask, 0, sizeof(mask));
                peer.sin_addr = p->prefix;
                peer.sin_family = p->family;
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
@@ -262,7 +262,7 @@ static int if_set_prefix_ctx(const struct zebra_dplane_ctx *ctx)
                       sizeof(struct sockaddr_in));
        }
 
-       memset(&mask, 0, sizeof(struct sockaddr_in));
+       memset(&mask, 0, sizeof(mask));
        masklen2ip(p->prefixlen, &mask.sin_addr);
        mask.sin_family = p->family;
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
@@ -293,7 +293,7 @@ static int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx)
        strlcpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx),
                sizeof(addreq.ifra_name));
 
-       memset(&addr, 0, sizeof(struct sockaddr_in));
+       memset(&addr, 0, sizeof(addr));
        addr.sin_addr = p->prefix;
        addr.sin_family = p->family;
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
@@ -303,7 +303,7 @@ static int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx)
 
        if (dplane_ctx_intf_is_connected(ctx)) {
                p = (struct prefix_ipv4 *)dplane_ctx_get_intf_dest(ctx);
-               memset(&mask, 0, sizeof(struct sockaddr_in));
+               memset(&mask, 0, sizeof(mask));
                peer.sin_addr = p->prefix;
                peer.sin_family = p->family;
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
@@ -313,7 +313,7 @@ static int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx)
                       sizeof(struct sockaddr_in));
        }
 
-       memset(&mask, 0, sizeof(struct sockaddr_in));
+       memset(&mask, 0, sizeof(mask));
        masklen2ip(p->prefixlen, &mask.sin_addr);
        mask.sin_family = p->family;
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
@@ -394,7 +394,7 @@ int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx)
        strlcpy(ifreq.ifr_name, dplane_ctx_get_ifname(ctx),
                sizeof(ifreq.ifr_name));
 
-       memset(&addr, 0, sizeof(struct sockaddr_in));
+       memset(&addr, 0, sizeof(addr));
        addr.sin_family = p->family;
        memcpy(&ifreq.ifr_addr, &addr, sizeof(struct sockaddr_in));
        ret = if_ioctl(SIOCSIFADDR, (caddr_t)&ifreq);
@@ -508,7 +508,7 @@ int if_set_flags(struct interface *ifp, uint64_t flags)
        int ret;
        struct ifreq ifreq;
 
-       memset(&ifreq, 0, sizeof(struct ifreq));
+       memset(&ifreq, 0, sizeof(ifreq));
        ifreq_set_name(&ifreq, ifp);
 
        ifreq.ifr_flags = ifp->flags;
@@ -529,7 +529,7 @@ int if_unset_flags(struct interface *ifp, uint64_t flags)
        int ret;
        struct ifreq ifreq;
 
-       memset(&ifreq, 0, sizeof(struct ifreq));
+       memset(&ifreq, 0, sizeof(ifreq));
        ifreq_set_name(&ifreq, ifp);
 
        ifreq.ifr_flags = ifp->flags;
@@ -568,7 +568,7 @@ static int if_set_prefix6_ctx(const struct zebra_dplane_ctx *ctx)
        strlcpy((char *)&addreq.ifra_name,
                dplane_ctx_get_ifname(ctx), sizeof(addreq.ifra_name));
 
-       memset(&addr, 0, sizeof(struct sockaddr_in6));
+       memset(&addr, 0, sizeof(addr));
        addr.sin6_addr = p->prefix;
        addr.sin6_family = p->family;
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
@@ -576,7 +576,7 @@ static int if_set_prefix6_ctx(const struct zebra_dplane_ctx *ctx)
 #endif
        memcpy(&addreq.ifra_addr, &addr, sizeof(struct sockaddr_in6));
 
-       memset(&mask, 0, sizeof(struct sockaddr_in6));
+       memset(&mask, 0, sizeof(mask));
        masklen2ip6(p->prefixlen, &mask.sin6_addr);
        mask.sin6_family = p->family;
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
@@ -615,7 +615,7 @@ static int if_unset_prefix6_ctx(const struct zebra_dplane_ctx *ctx)
        strlcpy((char *)&addreq.ifra_name,
                dplane_ctx_get_ifname(ctx), sizeof(addreq.ifra_name));
 
-       memset(&addr, 0, sizeof(struct sockaddr_in6));
+       memset(&addr, 0, sizeof(addr));
        addr.sin6_addr = p->prefix;
        addr.sin6_family = p->family;
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
@@ -623,7 +623,7 @@ static int if_unset_prefix6_ctx(const struct zebra_dplane_ctx *ctx)
 #endif
        memcpy(&addreq.ifra_addr, &addr, sizeof(struct sockaddr_in6));
 
-       memset(&mask, 0, sizeof(struct sockaddr_in6));
+       memset(&mask, 0, sizeof(mask));
        masklen2ip6(p->prefixlen, &mask.sin6_addr);
        mask.sin6_family = p->family;
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN