Hello -

This diff converts some malloc/bcopy to malloc/memcpy.  netinet6
didn't get the bcopy->memcpy overhaul like netinet did.

Index: netinet6/ip6_output.c
===================================================================
RCS file: /cvs/src/sys/netinet6/ip6_output.c,v
retrieving revision 1.189
diff -u -p -r1.189 ip6_output.c
--- netinet6/ip6_output.c       23 Sep 2015 08:49:46 -0000      1.189
+++ netinet6/ip6_output.c       8 Oct 2015 15:09:01 -0000
@@ -2189,7 +2189,7 @@ do {\
                dst->type = malloc(hlen, M_IP6OPT, canwait);\
                if (dst->type == NULL && canwait == M_NOWAIT)\
                        goto bad;\
-               bcopy(src->type, dst->type, hlen);\
+               memcpy(dst->type, src->type, hlen);\
        }\
 } while (/*CONSTCOND*/ 0)
 
@@ -2211,7 +2211,7 @@ copypktopts(struct ip6_pktopts *dst, str
                    M_IP6OPT, canwait);
                if (dst->ip6po_nexthop == NULL)
                        goto bad;
-               bcopy(src->ip6po_nexthop, dst->ip6po_nexthop,
+               memcpy(dst->ip6po_nexthop, src->ip6po_nexthop,
                    src->ip6po_nexthop->sa_len);
        }
        PKTOPT_EXTHDRCPY(ip6po_hbh);
@@ -2847,7 +2847,7 @@ ip6_setpktopt(int optname, u_char *buf, 
                opt->ip6po_nexthop = malloc(*buf, M_IP6OPT, M_NOWAIT);
                if (opt->ip6po_nexthop == NULL)
                        return (ENOBUFS);
-               bcopy(buf, opt->ip6po_nexthop, *buf);
+               memcpy(opt->ip6po_nexthop, buf, *buf);
                break;
 
        case IPV6_2292HOPOPTS:
@@ -2882,7 +2882,7 @@ ip6_setpktopt(int optname, u_char *buf, 
                opt->ip6po_hbh = malloc(hbhlen, M_IP6OPT, M_NOWAIT);
                if (opt->ip6po_hbh == NULL)
                        return (ENOBUFS);
-               bcopy(hbh, opt->ip6po_hbh, hbhlen);
+               memcpy(opt->ip6po_hbh, hbh, hbhlen);
 
                break;
        }
@@ -2945,7 +2945,7 @@ ip6_setpktopt(int optname, u_char *buf, 
                *newdest = malloc(destlen, M_IP6OPT, M_NOWAIT);
                if (*newdest == NULL)
                        return (ENOBUFS);
-               bcopy(dest, *newdest, destlen);
+               memcpy(*newdest, dest, destlen);
 
                break;
        }
@@ -2986,7 +2986,7 @@ ip6_setpktopt(int optname, u_char *buf, 
                opt->ip6po_rthdr = malloc(rthlen, M_IP6OPT, M_NOWAIT);
                if (opt->ip6po_rthdr == NULL)
                        return (ENOBUFS);
-               bcopy(rth, opt->ip6po_rthdr, rthlen);
+               memcpy(opt->ip6po_rthdr, rth, rthlen);
                break;
        }
 

Reply via email to