diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2020-08-26 22:36:08 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2020-08-26 22:36:08 +0000 |
| commit | 62cddd0e033f7a4cbf460b0a8e61c34797073e16 (patch) | |
| tree | 4324b9b6f5c5e47e8cea0dda1339c83355de1b74 | |
| parent | df665abd347e2141f54fcbcb44092f21b232fd85 (diff) | |
Notes
| -rw-r--r-- | sys/opencrypto/cryptodev.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index 5fa357d04178d..5c0718d114a84 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -440,7 +440,7 @@ cryptof_ioctl( struct crypt_aead aeadc; struct crypt_kop kopc; #endif - }; + } thunk; #ifdef COMPAT_FREEBSD32 u_long cmd32; void *data32; @@ -452,29 +452,30 @@ cryptof_ioctl( cmd32 = cmd; data32 = data; cmd = CIOCGSESSION; - data = &sopc; - session_op_from_32((struct session_op32 *)data32, &sopc); + data = &thunk.sopc; + session_op_from_32((struct session_op32 *)data32, &thunk.sopc); break; case CIOCGSESSION232: cmd32 = cmd; data32 = data; cmd = CIOCGSESSION2; - data = &sopc; - session2_op_from_32((struct session2_op32 *)data32, &sopc); + data = &thunk.sopc; + session2_op_from_32((struct session2_op32 *)data32, + &thunk.sopc); break; case CIOCCRYPT32: cmd32 = cmd; data32 = data; cmd = CIOCCRYPT; - data = &copc; - crypt_op_from_32((struct crypt_op32 *)data32, &copc); + data = &thunk.copc; + crypt_op_from_32((struct crypt_op32 *)data32, &thunk.copc); break; case CIOCCRYPTAEAD32: cmd32 = cmd; data32 = data; cmd = CIOCCRYPTAEAD; - data = &aeadc; - crypt_aead_from_32((struct crypt_aead32 *)data32, &aeadc); + data = &thunk.aeadc; + crypt_aead_from_32((struct crypt_aead32 *)data32, &thunk.aeadc); break; case CIOCKEY32: case CIOCKEY232: @@ -484,8 +485,8 @@ cryptof_ioctl( cmd = CIOCKEY; else cmd = CIOCKEY2; - data = &kopc; - crypt_kop_from_32((struct crypt_kop32 *)data32, &kopc); + data = &thunk.kopc; + crypt_kop_from_32((struct crypt_kop32 *)data32, &thunk.kopc); break; } #endif @@ -494,8 +495,8 @@ cryptof_ioctl( case CIOCGSESSION: case CIOCGSESSION2: if (cmd == CIOCGSESSION) { - session2_op_from_op(data, &sopc); - sop = &sopc; + session2_op_from_op(data, &thunk.sopc); + sop = &thunk.sopc; } else sop = (struct session2_op *)data; |