Re: Change bcopy to memcpy (i386 VIA PadLock driver)

2017-12-13 Thread David Gwynne 

> On 14 Dec 2017, at 07:23, Frederic Cambus  wrote:
> 
> Hi tech@,
> 
> This diff changes bcopy to memcpy in the i386 version of the VIA PadLock
> driver. It was done a while ago in the amd64 version of the driver.
> 
> Comments? OK?

ok

> 
> Index: sys/arch/i386/i386/via.c
> ===
> RCS file: /cvs/src/sys/arch/i386/i386/via.c,v
> retrieving revision 1.37
> diff -u -p -r1.37 via.c
> --- sys/arch/i386/i386/via.c  2 May 2017 11:47:49 -   1.37
> +++ sys/arch/i386/i386/via.c  10 Dec 2017 14:01:21 -
> @@ -161,7 +161,7 @@ viac3_crypto_newsession(u_int32_t *sidp,
>   M_NOWAIT);
>   if (ses == NULL)
>   return (ENOMEM);
> - bcopy(sc->sc_sessions, ses, sesn * sizeof(*ses));
> + memcpy(ses, sc->sc_sessions, sesn * sizeof(*ses));
>   explicit_bzero(sc->sc_sessions, sesn * sizeof(*ses));
>   free(sc->sc_sessions, M_DEVBUF, sesn * sizeof(*ses));
>   sc->sc_sessions = ses;
> @@ -370,7 +370,7 @@ viac3_crypto_encdec(struct cryptop *crp,
>   sc->op_cw[0] = ses->ses_cw0 | C3_CRYPT_CWLO_ENCRYPT;
>   key = ses->ses_ekey;
>   if (crd->crd_flags & CRD_F_IV_EXPLICIT)
> - bcopy(crd->crd_iv, sc->op_iv, 16);
> + memcpy(sc->op_iv, crd->crd_iv, 16);
>   else
>   arc4random_buf(sc->op_iv, 16);
> 
> @@ -382,8 +382,8 @@ viac3_crypto_encdec(struct cryptop *crp,
>   cuio_copyback((struct uio *)crp->crp_buf,
>   crd->crd_inject, 16, sc->op_iv);
>   else
> - bcopy(sc->op_iv,
> - crp->crp_buf + crd->crd_inject, 16);
> + memcpy(crp->crp_buf + crd->crd_inject,
> + sc->op_iv, 16);
>   if (err)
>   return (err);
>   }
> @@ -391,7 +391,7 @@ viac3_crypto_encdec(struct cryptop *crp,
>   sc->op_cw[0] = ses->ses_cw0 | C3_CRYPT_CWLO_DECRYPT;
>   key = ses->ses_dkey;
>   if (crd->crd_flags & CRD_F_IV_EXPLICIT)
> - bcopy(crd->crd_iv, sc->op_iv, 16);
> + memcpy(sc->op_iv, crd->crd_iv, 16);
>   else {
>   if (crp->crp_flags & CRYPTO_F_IMBUF)
>   m_copydata((struct mbuf *)crp->crp_buf,
> @@ -400,8 +400,8 @@ viac3_crypto_encdec(struct cryptop *crp,
>   cuio_copydata((struct uio *)crp->crp_buf,
>   crd->crd_inject, 16, sc->op_iv);
>   else
> - bcopy(crp->crp_buf + crd->crd_inject,
> - sc->op_iv, 16);
> + memcpy(sc->op_iv,
> + crp->crp_buf + crd->crd_inject, 16);
>   }
>   }
> 
> @@ -412,7 +412,7 @@ viac3_crypto_encdec(struct cryptop *crp,
>   cuio_copydata((struct uio *)crp->crp_buf,
>   crd->crd_skip, crd->crd_len, sc->op_buf);
>   else
> - bcopy(crp->crp_buf + crd->crd_skip, sc->op_buf, crd->crd_len);
> + memcpy(sc->op_buf, crp->crp_buf + crd->crd_skip, crd->crd_len);
> 
>   sc->op_cw[1] = sc->op_cw[2] = sc->op_cw[3] = 0;
>   viac3_cbc(>op_cw, sc->op_buf, sc->op_buf, key,
> @@ -425,7 +425,7 @@ viac3_crypto_encdec(struct cryptop *crp,
>   cuio_copyback((struct uio *)crp->crp_buf,
>   crd->crd_skip, crd->crd_len, sc->op_buf);
>   else
> - bcopy(sc->op_buf, crp->crp_buf + crd->crd_skip,
> + memcpy(crp->crp_buf + crd->crd_skip, sc->op_buf,
>   crd->crd_len);
> 
>   if (sc->op_buf != NULL) {
>

Re: Change bcopy to memcpy (i386 VIA PadLock driver)

2017-12-13 Thread Mike Larkin 
On Wed, Dec 13, 2017 at 10:23:46PM +0100, Frederic Cambus wrote:
> Hi tech@,
> 
> This diff changes bcopy to memcpy in the i386 version of the VIA PadLock
> driver. It was done a while ago in the amd64 version of the driver.
> 
> Comments? OK?
> 

ok mlarkin

> Index: sys/arch/i386/i386/via.c
> ===
> RCS file: /cvs/src/sys/arch/i386/i386/via.c,v
> retrieving revision 1.37
> diff -u -p -r1.37 via.c
> --- sys/arch/i386/i386/via.c  2 May 2017 11:47:49 -   1.37
> +++ sys/arch/i386/i386/via.c  10 Dec 2017 14:01:21 -
> @@ -161,7 +161,7 @@ viac3_crypto_newsession(u_int32_t *sidp,
>   M_NOWAIT);
>   if (ses == NULL)
>   return (ENOMEM);
> - bcopy(sc->sc_sessions, ses, sesn * sizeof(*ses));
> + memcpy(ses, sc->sc_sessions, sesn * sizeof(*ses));
>   explicit_bzero(sc->sc_sessions, sesn * sizeof(*ses));
>   free(sc->sc_sessions, M_DEVBUF, sesn * sizeof(*ses));
>   sc->sc_sessions = ses;
> @@ -370,7 +370,7 @@ viac3_crypto_encdec(struct cryptop *crp,
>   sc->op_cw[0] = ses->ses_cw0 | C3_CRYPT_CWLO_ENCRYPT;
>   key = ses->ses_ekey;
>   if (crd->crd_flags & CRD_F_IV_EXPLICIT)
> - bcopy(crd->crd_iv, sc->op_iv, 16);
> + memcpy(sc->op_iv, crd->crd_iv, 16);
>   else
>   arc4random_buf(sc->op_iv, 16);
>  
> @@ -382,8 +382,8 @@ viac3_crypto_encdec(struct cryptop *crp,
>   cuio_copyback((struct uio *)crp->crp_buf,
>   crd->crd_inject, 16, sc->op_iv);
>   else
> - bcopy(sc->op_iv,
> - crp->crp_buf + crd->crd_inject, 16);
> + memcpy(crp->crp_buf + crd->crd_inject,
> + sc->op_iv, 16);
>   if (err)
>   return (err);
>   }
> @@ -391,7 +391,7 @@ viac3_crypto_encdec(struct cryptop *crp,
>   sc->op_cw[0] = ses->ses_cw0 | C3_CRYPT_CWLO_DECRYPT;
>   key = ses->ses_dkey;
>   if (crd->crd_flags & CRD_F_IV_EXPLICIT)
> - bcopy(crd->crd_iv, sc->op_iv, 16);
> + memcpy(sc->op_iv, crd->crd_iv, 16);
>   else {
>   if (crp->crp_flags & CRYPTO_F_IMBUF)
>   m_copydata((struct mbuf *)crp->crp_buf,
> @@ -400,8 +400,8 @@ viac3_crypto_encdec(struct cryptop *crp,
>   cuio_copydata((struct uio *)crp->crp_buf,
>   crd->crd_inject, 16, sc->op_iv);
>   else
> - bcopy(crp->crp_buf + crd->crd_inject,
> - sc->op_iv, 16);
> + memcpy(sc->op_iv,
> + crp->crp_buf + crd->crd_inject, 16);
>   }
>   }
>  
> @@ -412,7 +412,7 @@ viac3_crypto_encdec(struct cryptop *crp,
>   cuio_copydata((struct uio *)crp->crp_buf,
>   crd->crd_skip, crd->crd_len, sc->op_buf);
>   else
> - bcopy(crp->crp_buf + crd->crd_skip, sc->op_buf, crd->crd_len);
> + memcpy(sc->op_buf, crp->crp_buf + crd->crd_skip, crd->crd_len);
>  
>   sc->op_cw[1] = sc->op_cw[2] = sc->op_cw[3] = 0;
>   viac3_cbc(>op_cw, sc->op_buf, sc->op_buf, key,
> @@ -425,7 +425,7 @@ viac3_crypto_encdec(struct cryptop *crp,
>   cuio_copyback((struct uio *)crp->crp_buf,
>   crd->crd_skip, crd->crd_len, sc->op_buf);
>   else
> - bcopy(sc->op_buf, crp->crp_buf + crd->crd_skip,
> + memcpy(crp->crp_buf + crd->crd_skip, sc->op_buf,
>   crd->crd_len);
>  
>   if (sc->op_buf != NULL) {
>

Change bcopy to memcpy (i386 VIA PadLock driver)

2017-12-13 Thread Frederic Cambus 
Hi tech@,

This diff changes bcopy to memcpy in the i386 version of the VIA PadLock
driver. It was done a while ago in the amd64 version of the driver.

Comments? OK?

Index: sys/arch/i386/i386/via.c
===
RCS file: /cvs/src/sys/arch/i386/i386/via.c,v
retrieving revision 1.37
diff -u -p -r1.37 via.c
--- sys/arch/i386/i386/via.c2 May 2017 11:47:49 -   1.37
+++ sys/arch/i386/i386/via.c10 Dec 2017 14:01:21 -
@@ -161,7 +161,7 @@ viac3_crypto_newsession(u_int32_t *sidp,
M_NOWAIT);
if (ses == NULL)
return (ENOMEM);
-   bcopy(sc->sc_sessions, ses, sesn * sizeof(*ses));
+   memcpy(ses, sc->sc_sessions, sesn * sizeof(*ses));
explicit_bzero(sc->sc_sessions, sesn * sizeof(*ses));
free(sc->sc_sessions, M_DEVBUF, sesn * sizeof(*ses));
sc->sc_sessions = ses;
@@ -370,7 +370,7 @@ viac3_crypto_encdec(struct cryptop *crp,
sc->op_cw[0] = ses->ses_cw0 | C3_CRYPT_CWLO_ENCRYPT;
key = ses->ses_ekey;
if (crd->crd_flags & CRD_F_IV_EXPLICIT)
-   bcopy(crd->crd_iv, sc->op_iv, 16);
+   memcpy(sc->op_iv, crd->crd_iv, 16);
else
arc4random_buf(sc->op_iv, 16);
 
@@ -382,8 +382,8 @@ viac3_crypto_encdec(struct cryptop *crp,
cuio_copyback((struct uio *)crp->crp_buf,
crd->crd_inject, 16, sc->op_iv);
else
-   bcopy(sc->op_iv,
-   crp->crp_buf + crd->crd_inject, 16);
+   memcpy(crp->crp_buf + crd->crd_inject,
+   sc->op_iv, 16);
if (err)
return (err);
}
@@ -391,7 +391,7 @@ viac3_crypto_encdec(struct cryptop *crp,
sc->op_cw[0] = ses->ses_cw0 | C3_CRYPT_CWLO_DECRYPT;
key = ses->ses_dkey;
if (crd->crd_flags & CRD_F_IV_EXPLICIT)
-   bcopy(crd->crd_iv, sc->op_iv, 16);
+   memcpy(sc->op_iv, crd->crd_iv, 16);
else {
if (crp->crp_flags & CRYPTO_F_IMBUF)
m_copydata((struct mbuf *)crp->crp_buf,
@@ -400,8 +400,8 @@ viac3_crypto_encdec(struct cryptop *crp,
cuio_copydata((struct uio *)crp->crp_buf,
crd->crd_inject, 16, sc->op_iv);
else
-   bcopy(crp->crp_buf + crd->crd_inject,
-   sc->op_iv, 16);
+   memcpy(sc->op_iv,
+   crp->crp_buf + crd->crd_inject, 16);
}
}
 
@@ -412,7 +412,7 @@ viac3_crypto_encdec(struct cryptop *crp,
cuio_copydata((struct uio *)crp->crp_buf,
crd->crd_skip, crd->crd_len, sc->op_buf);
else
-   bcopy(crp->crp_buf + crd->crd_skip, sc->op_buf, crd->crd_len);
+   memcpy(sc->op_buf, crp->crp_buf + crd->crd_skip, crd->crd_len);
 
sc->op_cw[1] = sc->op_cw[2] = sc->op_cw[3] = 0;
viac3_cbc(>op_cw, sc->op_buf, sc->op_buf, key,
@@ -425,7 +425,7 @@ viac3_crypto_encdec(struct cryptop *crp,
cuio_copyback((struct uio *)crp->crp_buf,
crd->crd_skip, crd->crd_len, sc->op_buf);
else
-   bcopy(sc->op_buf, crp->crp_buf + crd->crd_skip,
+   memcpy(crp->crp_buf + crd->crd_skip, sc->op_buf,
crd->crd_len);
 
if (sc->op_buf != NULL) {