Author: kib
Date: Mon Jun 30 09:48:44 2014
New Revision: 268033
URL: http://svnweb.freebsd.org/changeset/base/268033
Log:
MFC r267767:
Add FPU_KERN_KTHR flag to fpu_kern_enter(9).
Apply the flag to padlock(4) and aesni(4).
In aesni_cipher_process(), do not leak FPU context state on error.
Modified:
stable/10/sys/amd64/amd64/fpu.c
stable/10/sys/amd64/include/fpu.h
stable/10/sys/crypto/aesni/aesni_wrap.c
stable/10/sys/crypto/via/padlock.c
stable/10/sys/crypto/via/padlock_cipher.c
stable/10/sys/crypto/via/padlock_hash.c
stable/10/sys/i386/include/npx.h
stable/10/sys/i386/isa/npx.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/amd64/amd64/fpu.c
==============================================================================
--- stable/10/sys/amd64/amd64/fpu.c Mon Jun 30 09:38:14 2014
(r268032)
+++ stable/10/sys/amd64/amd64/fpu.c Mon Jun 30 09:48:44 2014
(r268033)
@@ -890,6 +890,7 @@ static MALLOC_DEFINE(M_FPUKERN_CTX, "fpu
"Kernel contexts for FPU state");
#define FPU_KERN_CTX_FPUINITDONE 0x01
+#define FPU_KERN_CTX_DUMMY 0x02 /* avoided save for the kern
thread */
struct fpu_kern_ctx {
struct savefpu *prev;
@@ -933,6 +934,10 @@ fpu_kern_enter(struct thread *td, struct
{
struct pcb *pcb;
+ if ((flags & FPU_KERN_KTHR) != 0 && is_fpu_kern_thread(0)) {
+ ctx->flags = FPU_KERN_CTX_DUMMY;
+ return (0);
+ }
pcb = td->td_pcb;
KASSERT(!PCB_USER_FPU(pcb) || pcb->pcb_save ==
get_pcb_user_save_pcb(pcb), ("mangled pcb_save"));
@@ -952,6 +957,9 @@ fpu_kern_leave(struct thread *td, struct
{
struct pcb *pcb;
+ if (is_fpu_kern_thread(0) && (ctx->flags & FPU_KERN_CTX_DUMMY) != 0)
+ return (0);
+ KASSERT((ctx->flags & FPU_KERN_CTX_DUMMY) == 0, ("dummy ctx"));
pcb = td->td_pcb;
critical_enter();
if (curthread == PCPU_GET(fpcurthread))
Modified: stable/10/sys/amd64/include/fpu.h
==============================================================================
--- stable/10/sys/amd64/include/fpu.h Mon Jun 30 09:38:14 2014
(r268032)
+++ stable/10/sys/amd64/include/fpu.h Mon Jun 30 09:48:44 2014
(r268033)
@@ -84,6 +84,7 @@ void fpu_save_area_reset(struct savefpu
*/
#define FPU_KERN_NORMAL 0x0000
#define FPU_KERN_NOWAIT 0x0001
+#define FPU_KERN_KTHR 0x0002
#endif
Modified: stable/10/sys/crypto/aesni/aesni_wrap.c
==============================================================================
--- stable/10/sys/crypto/aesni/aesni_wrap.c Mon Jun 30 09:38:14 2014
(r268032)
+++ stable/10/sys/crypto/aesni/aesni_wrap.c Mon Jun 30 09:48:44 2014
(r268033)
@@ -382,22 +382,16 @@ int
aesni_cipher_setup(struct aesni_session *ses, struct cryptoini *encini)
{
struct thread *td;
- int error, saved_ctx;
+ int error;
td = curthread;
- if (!is_fpu_kern_thread(0)) {
- error = fpu_kern_enter(td, ses->fpu_ctx, FPU_KERN_NORMAL);
- saved_ctx = 1;
- } else {
- error = 0;
- saved_ctx = 0;
- }
- if (error == 0) {
- error = aesni_cipher_setup_common(ses, encini->cri_key,
- encini->cri_klen);
- if (saved_ctx)
- fpu_kern_leave(td, ses->fpu_ctx);
- }
+ error = fpu_kern_enter(td, ses->fpu_ctx, FPU_KERN_NORMAL |
+ FPU_KERN_KTHR);
+ if (error != 0)
+ return (error);
+ error = aesni_cipher_setup_common(ses, encini->cri_key,
+ encini->cri_klen);
+ fpu_kern_leave(td, ses->fpu_ctx);
return (error);
}
@@ -407,22 +401,17 @@ aesni_cipher_process(struct aesni_sessio
{
struct thread *td;
uint8_t *buf;
- int error, allocated, saved_ctx;
+ int error, allocated;
buf = aesni_cipher_alloc(enccrd, crp, &allocated);
if (buf == NULL)
return (ENOMEM);
td = curthread;
- if (!is_fpu_kern_thread(0)) {
- error = fpu_kern_enter(td, ses->fpu_ctx, FPU_KERN_NORMAL);
- if (error != 0)
- goto out;
- saved_ctx = 1;
- } else {
- saved_ctx = 0;
- error = 0;
- }
+ error = fpu_kern_enter(td, ses->fpu_ctx, FPU_KERN_NORMAL |
+ FPU_KERN_KTHR);
+ if (error != 0)
+ goto out1;
if ((enccrd->crd_flags & CRD_F_KEY_EXPLICIT) != 0) {
error = aesni_cipher_setup_common(ses, enccrd->crd_key,
@@ -460,8 +449,6 @@ aesni_cipher_process(struct aesni_sessio
ses->iv);
}
}
- if (saved_ctx)
- fpu_kern_leave(td, ses->fpu_ctx);
if (allocated)
crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_skip,
enccrd->crd_len, buf);
@@ -469,7 +456,9 @@ aesni_cipher_process(struct aesni_sessio
crypto_copydata(crp->crp_flags, crp->crp_buf,
enccrd->crd_skip + enccrd->crd_len - AES_BLOCK_LEN,
AES_BLOCK_LEN, ses->iv);
- out:
+out:
+ fpu_kern_leave(td, ses->fpu_ctx);
+out1:
if (allocated) {
bzero(buf, enccrd->crd_len);
free(buf, M_AESNI);
Modified: stable/10/sys/crypto/via/padlock.c
==============================================================================
--- stable/10/sys/crypto/via/padlock.c Mon Jun 30 09:38:14 2014
(r268032)
+++ stable/10/sys/crypto/via/padlock.c Mon Jun 30 09:48:44 2014
(r268033)
@@ -171,7 +171,7 @@ padlock_newsession(device_t dev, uint32_
struct padlock_session *ses = NULL;
struct cryptoini *encini, *macini;
struct thread *td;
- int error, saved_ctx;
+ int error;
if (sidp == NULL || cri == NULL)
return (EINVAL);
@@ -246,18 +246,11 @@ padlock_newsession(device_t dev, uint32_
if (macini != NULL) {
td = curthread;
- if (!is_fpu_kern_thread(0)) {
- error = fpu_kern_enter(td, ses->ses_fpu_ctx,
- FPU_KERN_NORMAL);
- saved_ctx = 1;
- } else {
- error = 0;
- saved_ctx = 0;
- }
+ error = fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL |
+ FPU_KERN_KTHR);
if (error == 0) {
error = padlock_hash_setup(ses, macini);
- if (saved_ctx)
- fpu_kern_leave(td, ses->ses_fpu_ctx);
+ fpu_kern_leave(td, ses->ses_fpu_ctx);
}
if (error != 0) {
padlock_freesession_one(sc, ses, 0);
Modified: stable/10/sys/crypto/via/padlock_cipher.c
==============================================================================
--- stable/10/sys/crypto/via/padlock_cipher.c Mon Jun 30 09:38:14 2014
(r268032)
+++ stable/10/sys/crypto/via/padlock_cipher.c Mon Jun 30 09:48:44 2014
(r268033)
@@ -205,7 +205,7 @@ padlock_cipher_process(struct padlock_se
struct thread *td;
u_char *buf, *abuf;
uint32_t *key;
- int allocated, error, saved_ctx;
+ int allocated, error;
buf = padlock_cipher_alloc(enccrd, crp, &allocated);
if (buf == NULL)
@@ -250,21 +250,13 @@ padlock_cipher_process(struct padlock_se
}
td = curthread;
- if (!is_fpu_kern_thread(0)) {
- error = fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL);
- saved_ctx = 1;
- } else {
- error = 0;
- saved_ctx = 0;
- }
+ error = fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL |
+ FPU_KERN_KTHR);
if (error != 0)
goto out;
-
padlock_cbc(abuf, abuf, enccrd->crd_len / AES_BLOCK_LEN, key, cw,
ses->ses_iv);
-
- if (saved_ctx)
- fpu_kern_leave(td, ses->ses_fpu_ctx);
+ fpu_kern_leave(td, ses->ses_fpu_ctx);
if (allocated) {
crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_skip,
Modified: stable/10/sys/crypto/via/padlock_hash.c
==============================================================================
--- stable/10/sys/crypto/via/padlock_hash.c Mon Jun 30 09:38:14 2014
(r268032)
+++ stable/10/sys/crypto/via/padlock_hash.c Mon Jun 30 09:48:44 2014
(r268033)
@@ -366,24 +366,18 @@ padlock_hash_process(struct padlock_sess
struct cryptop *crp)
{
struct thread *td;
- int error, saved_ctx;
+ int error;
td = curthread;
- if (!is_fpu_kern_thread(0)) {
- error = fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL);
- saved_ctx = 1;
- } else {
- error = 0;
- saved_ctx = 0;
- }
+ error = fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL |
+ FPU_KERN_KTHR);
if (error != 0)
return (error);
if ((maccrd->crd_flags & CRD_F_KEY_EXPLICIT) != 0)
padlock_hash_key_setup(ses, maccrd->crd_key, maccrd->crd_klen);
error = padlock_authcompute(ses, maccrd, crp->crp_buf, crp->crp_flags);
- if (saved_ctx)
- fpu_kern_leave(td, ses->ses_fpu_ctx);
+ fpu_kern_leave(td, ses->ses_fpu_ctx);
return (error);
}
Modified: stable/10/sys/i386/include/npx.h
==============================================================================
--- stable/10/sys/i386/include/npx.h Mon Jun 30 09:38:14 2014
(r268032)
+++ stable/10/sys/i386/include/npx.h Mon Jun 30 09:48:44 2014
(r268033)
@@ -71,6 +71,7 @@ int is_fpu_kern_thread(u_int flags);
*/
#define FPU_KERN_NORMAL 0x0000
#define FPU_KERN_NOWAIT 0x0001
+#define FPU_KERN_KTHR 0x0002
#endif
Modified: stable/10/sys/i386/isa/npx.c
==============================================================================
--- stable/10/sys/i386/isa/npx.c Mon Jun 30 09:38:14 2014
(r268032)
+++ stable/10/sys/i386/isa/npx.c Mon Jun 30 09:48:44 2014
(r268033)
@@ -1008,6 +1008,7 @@ static MALLOC_DEFINE(M_FPUKERN_CTX, "fpu
#define XSAVE_AREA_ALIGN 64
#define FPU_KERN_CTX_NPXINITDONE 0x01
+#define FPU_KERN_CTX_DUMMY 0x02
struct fpu_kern_ctx {
union savefpu *prev;
@@ -1051,6 +1052,10 @@ fpu_kern_enter(struct thread *td, struct
{
struct pcb *pcb;
+ if ((flags & FPU_KERN_KTHR) != 0 && is_fpu_kern_thread(0)) {
+ ctx->flags = FPU_KERN_CTX_DUMMY;
+ return (0);
+ }
pcb = td->td_pcb;
KASSERT(!PCB_USER_FPU(pcb) || pcb->pcb_save == &pcb->pcb_user_save,
("mangled pcb_save"));
@@ -1070,6 +1075,8 @@ fpu_kern_leave(struct thread *td, struct
{
struct pcb *pcb;
+ if (is_fpu_kern_thread(0) && (ctx->flags & FPU_KERN_CTX_DUMMY) != 0)
+ return (0);
pcb = td->td_pcb;
critical_enter();
if (curthread == PCPU_GET(fpcurthread))
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
