diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-01-18 13:30:10 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-01-18 13:30:10 -0500 |
| commit | daf61a2ba69d236f9da41f1a991cf8af3f3ff72c (patch) | |
| tree | f63cff2bcde5511605ed4466f719e2a7ccb54087 /usr/src/lib/libcrypt/common/cryptio.c | |
| parent | 561a2476a800c02bf5a1e7720002e17699fcaf27 (diff) | |
| parent | f859e7171bb5db34321e45585839c6c3200ebb90 (diff) | |
| download | illumos-joyent-daf61a2ba69d236f9da41f1a991cf8af3f3ff72c.tar.gz | |
[illumos-gate merge]
commit f859e7171bb5db34321e45585839c6c3200ebb90
14424 tmpfs can be induced to deadlock
commit d278f1c9d93ca9beb430b23636bc2a848535e0e0
14350 uath: mismatched bound
commit 53496f229747a02889ac4f8518b2e4b44ff2f9e0
14349 libcrypt: mismatched bound
commit dc1259b65efc626c37cd057774d3e3393e84c33c
14328 cscope-fast: this 'if' clause does not guard...
Diffstat (limited to 'usr/src/lib/libcrypt/common/cryptio.c')
| -rw-r--r-- | usr/src/lib/libcrypt/common/cryptio.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/lib/libcrypt/common/cryptio.c b/usr/src/lib/libcrypt/common/cryptio.c index 78b96aff48..613fdb3a31 100644 --- a/usr/src/lib/libcrypt/common/cryptio.c +++ b/usr/src/lib/libcrypt/common/cryptio.c @@ -25,9 +25,7 @@ */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" +/* All Rights Reserved */ #pragma weak _run_setkey = run_setkey #pragma weak _run_crypt = run_crypt @@ -48,7 +46,7 @@ #define READER 0 #define WRITER 1 -#define KSIZE 8 +#define KSIZE 8 /* Global Variables */ static char key[KSIZE+1]; @@ -65,7 +63,7 @@ static int writekey(); void _exit(); int -run_setkey(int p[2], const char *keyparam) +run_setkey(int *p, const char *keyparam) { (void) mutex_lock(&lock); if (cryptopen(p) == -1) { @@ -119,7 +117,7 @@ writekey(int p[2], char *keyarg) int -run_crypt(long offset, char *buffer, unsigned int count, int p[2]) +run_crypt(long offset, char *buffer, unsigned int count, int *p) { struct header header; void (*pstat) (); @@ -193,7 +191,7 @@ crypt_close_nolock(int p[2]) } int -crypt_close(int p[2]) +crypt_close(int *p) { (void) mutex_lock(&lock); (void) crypt_close_nolock(p); |