From 66f807ed8b3634dc73d9f7526c484e43f094c0ee Mon Sep 17 00:00:00 2001 From: des Date: Thu, 23 Oct 2008 15:53:51 +0000 Subject: Retire the MALLOC and FREE macros. They are an abomination unto style(9). MFC after: 3 months --- sys/opencrypto/cryptodev.c | 31 ++++++++++++++----------------- sys/opencrypto/cryptosoft.c | 14 +++++++------- sys/opencrypto/deflate.c | 14 +++++++------- sys/opencrypto/xform.c | 28 ++++++++++++++-------------- 4 files changed, 42 insertions(+), 45 deletions(-) (limited to 'sys/opencrypto') diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index fe7372b..ad314fb 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -267,8 +267,7 @@ cryptof_ioctl( goto bail; } - MALLOC(crie.cri_key, u_int8_t *, - crie.cri_klen / 8, M_XDATA, M_WAITOK); + crie.cri_key = malloc( crie.cri_klen / 8, M_XDATA, M_WAITOK); if ((error = copyin(sop->key, crie.cri_key, crie.cri_klen / 8))) goto bail; @@ -285,8 +284,7 @@ cryptof_ioctl( } if (cria.cri_klen) { - MALLOC(cria.cri_key, u_int8_t *, - cria.cri_klen / 8, M_XDATA, M_WAITOK); + cria.cri_key = malloc( cria.cri_klen / 8, M_XDATA, M_WAITOK); if ((error = copyin(sop->mackey, cria.cri_key, cria.cri_klen / 8))) goto bail; @@ -322,9 +320,9 @@ cryptof_ioctl( bail: if (error) { if (crie.cri_key) - FREE(crie.cri_key, M_XDATA); + free(crie.cri_key, M_XDATA); if (cria.cri_key) - FREE(cria.cri_key, M_XDATA); + free(cria.cri_key, M_XDATA); } break; case CIOCFSESSION: @@ -625,7 +623,7 @@ cryptodev_key(struct crypt_kop *kop) size = (krp->krp_param[i].crp_nbits + 7) / 8; if (size == 0) continue; - MALLOC(krp->krp_param[i].crp_p, caddr_t, size, M_XDATA, M_WAITOK); + krp->krp_param[i].crp_p = malloc(size, M_XDATA, M_WAITOK); if (i >= krp->krp_iparams) continue; error = copyin(kop->crk_param[i].crp_p, krp->krp_param[i].crp_p, size); @@ -662,7 +660,7 @@ fail: kop->crk_status = krp->krp_status; for (i = 0; i < CRK_MAXPARAM; i++) { if (krp->krp_param[i].crp_p) - FREE(krp->krp_param[i].crp_p, M_XDATA); + free(krp->krp_param[i].crp_p, M_XDATA); } free(krp, M_XDATA); } @@ -731,7 +729,7 @@ cryptof_close(struct file *fp, struct thread *td) TAILQ_REMOVE(&fcr->csessions, cse, next); (void)csefree(cse); } - FREE(fcr, M_XDATA); + free(fcr, M_XDATA); fp->f_data = NULL; return 0; } @@ -778,10 +776,10 @@ csecreate(struct fcrypt *fcr, u_int64_t sid, caddr_t key, u_int64_t keylen, #ifdef INVARIANTS /* NB: required when mtx_init is built with INVARIANTS */ - MALLOC(cse, struct csession *, sizeof(struct csession), + cse = malloc(sizeof(struct csession), M_XDATA, M_NOWAIT | M_ZERO); #else - MALLOC(cse, struct csession *, sizeof(struct csession), + cse = malloc(sizeof(struct csession), M_XDATA, M_NOWAIT); #endif if (cse == NULL) @@ -808,10 +806,10 @@ csefree(struct csession *cse) error = crypto_freesession(cse->sid); mtx_destroy(&cse->lock); if (cse->key) - FREE(cse->key, M_XDATA); + free(cse->key, M_XDATA); if (cse->mackey) - FREE(cse->mackey, M_XDATA); - FREE(cse, M_XDATA); + free(cse->mackey, M_XDATA); + free(cse, M_XDATA); return (error); } @@ -842,15 +840,14 @@ cryptoioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread switch (cmd) { case CRIOGET: - MALLOC(fcr, struct fcrypt *, - sizeof(struct fcrypt), M_XDATA, M_WAITOK); + fcr = malloc( sizeof(struct fcrypt), M_XDATA, M_WAITOK); TAILQ_INIT(&fcr->csessions); fcr->sesn = 0; error = falloc(td, &f, &fd); if (error) { - FREE(fcr, M_XDATA); + free(fcr, M_XDATA); return (error); } /* falloc automatically provides an extra reference to 'f'. */ diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c index ba83718..d115dbc 100644 --- a/sys/opencrypto/cryptosoft.c +++ b/sys/opencrypto/cryptosoft.c @@ -523,7 +523,7 @@ swcr_compdec(struct cryptodesc *crd, struct swcr_data *sw, * copy in a buffer. */ - MALLOC(data, u_int8_t *, crd->crd_len, M_CRYPTO_DATA, M_NOWAIT); + data = malloc(crd->crd_len, M_CRYPTO_DATA, M_NOWAIT); if (data == NULL) return (EINVAL); crypto_copydata(flags, buf, crd->crd_skip, crd->crd_len, data); @@ -533,7 +533,7 @@ swcr_compdec(struct cryptodesc *crd, struct swcr_data *sw, else result = cxf->decompress(data, crd->crd_len, &out); - FREE(data, M_CRYPTO_DATA); + free(data, M_CRYPTO_DATA); if (result == 0) return EINVAL; @@ -545,7 +545,7 @@ swcr_compdec(struct cryptodesc *crd, struct swcr_data *sw, if (crd->crd_flags & CRD_F_COMP) { if (result > crd->crd_len) { /* Compression was useless, we lost time */ - FREE(out, M_CRYPTO_DATA); + free(out, M_CRYPTO_DATA); return 0; } } @@ -576,7 +576,7 @@ swcr_compdec(struct cryptodesc *crd, struct swcr_data *sw, } } } - FREE(out, M_CRYPTO_DATA); + free(out, M_CRYPTO_DATA); return 0; } @@ -635,7 +635,7 @@ swcr_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri) *sid = i; while (cri) { - MALLOC(*swd, struct swcr_data *, sizeof(struct swcr_data), + *swd = malloc(sizeof(struct swcr_data), M_CRYPTO_DATA, M_NOWAIT|M_ZERO); if (*swd == NULL) { swcr_freesession(dev, i); @@ -873,7 +873,7 @@ swcr_freesession(device_t dev, u_int64_t tid) break; } - FREE(swd, M_CRYPTO_DATA); + free(swd, M_CRYPTO_DATA); } return 0; } @@ -1036,7 +1036,7 @@ swcr_detach(device_t dev) { crypto_unregister_all(swcr_id); if (swcr_sessions != NULL) - FREE(swcr_sessions, M_CRYPTO_DATA); + free(swcr_sessions, M_CRYPTO_DATA); } static device_method_t swcr_methods[] = { diff --git a/sys/opencrypto/deflate.c b/sys/opencrypto/deflate.c index 49021d7..f4b4f48 100644 --- a/sys/opencrypto/deflate.c +++ b/sys/opencrypto/deflate.c @@ -79,7 +79,7 @@ deflate_global(data, size, decomp, out) zbuf.avail_in = size; /* Total length of data to be processed */ if (!decomp) { - MALLOC(buf[i].out, u_int8_t *, (u_long) size, M_CRYPTO_DATA, + buf[i].out = malloc((u_long) size, M_CRYPTO_DATA, M_NOWAIT); if (buf[i].out == NULL) goto bad; @@ -94,7 +94,7 @@ deflate_global(data, size, decomp, out) * updated while the decompression is going on */ - MALLOC(buf[i].out, u_int8_t *, (u_long) (size * 4), + buf[i].out = malloc((u_long) (size * 4), M_CRYPTO_DATA, M_NOWAIT); if (buf[i].out == NULL) goto bad; @@ -121,7 +121,7 @@ deflate_global(data, size, decomp, out) goto end; else if (zbuf.avail_out == 0 && i < (ZBUF - 1)) { /* we need more output space, allocate size */ - MALLOC(buf[i].out, u_int8_t *, (u_long) size, + buf[i].out = malloc((u_long) size, M_CRYPTO_DATA, M_NOWAIT); if (buf[i].out == NULL) goto bad; @@ -137,7 +137,7 @@ deflate_global(data, size, decomp, out) end: result = count = zbuf.total_out; - MALLOC(*out, u_int8_t *, (u_long) result, M_CRYPTO_DATA, M_NOWAIT); + *out = malloc((u_long) result, M_CRYPTO_DATA, M_NOWAIT); if (*out == NULL) goto bad; if (decomp) @@ -149,13 +149,13 @@ end: if (count > buf[j].size) { bcopy(buf[j].out, *out, buf[j].size); *out += buf[j].size; - FREE(buf[j].out, M_CRYPTO_DATA); + free(buf[j].out, M_CRYPTO_DATA); count -= buf[j].size; } else { /* it should be the last buffer */ bcopy(buf[j].out, *out, count); *out += count; - FREE(buf[j].out, M_CRYPTO_DATA); + free(buf[j].out, M_CRYPTO_DATA); count = 0; } } @@ -165,7 +165,7 @@ end: bad: *out = NULL; for (j = 0; buf[j].flag != 0; j++) - FREE(buf[j].out, M_CRYPTO_DATA); + free(buf[j].out, M_CRYPTO_DATA); if (decomp) inflateEnd(&zbuf); else diff --git a/sys/opencrypto/xform.c b/sys/opencrypto/xform.c index 464429f..1de9a17 100644 --- a/sys/opencrypto/xform.c +++ b/sys/opencrypto/xform.c @@ -313,7 +313,7 @@ des1_setkey(u_int8_t **sched, u_int8_t *key, int len) des_key_schedule *p; int err; - MALLOC(p, des_key_schedule *, sizeof (des_key_schedule), + p = malloc(sizeof (des_key_schedule), M_CRYPTO_DATA, M_NOWAIT|M_ZERO); if (p != NULL) { des_set_key((des_cblock *) key, p[0]); @@ -328,7 +328,7 @@ static void des1_zerokey(u_int8_t **sched) { bzero(*sched, sizeof (des_key_schedule)); - FREE(*sched, M_CRYPTO_DATA); + free(*sched, M_CRYPTO_DATA); *sched = NULL; } @@ -356,7 +356,7 @@ des3_setkey(u_int8_t **sched, u_int8_t *key, int len) des_key_schedule *p; int err; - MALLOC(p, des_key_schedule *, 3*sizeof (des_key_schedule), + p = malloc(3*sizeof (des_key_schedule), M_CRYPTO_DATA, M_NOWAIT|M_ZERO); if (p != NULL) { des_set_key((des_cblock *)(key + 0), p[0]); @@ -373,7 +373,7 @@ static void des3_zerokey(u_int8_t **sched) { bzero(*sched, 3*sizeof (des_key_schedule)); - FREE(*sched, M_CRYPTO_DATA); + free(*sched, M_CRYPTO_DATA); *sched = NULL; } @@ -412,7 +412,7 @@ blf_setkey(u_int8_t **sched, u_int8_t *key, int len) { int err; - MALLOC(*sched, u_int8_t *, sizeof(BF_KEY), + *sched = malloc(sizeof(BF_KEY), M_CRYPTO_DATA, M_NOWAIT|M_ZERO); if (*sched != NULL) { BF_set_key((BF_KEY *) *sched, len, key); @@ -426,7 +426,7 @@ static void blf_zerokey(u_int8_t **sched) { bzero(*sched, sizeof(BF_KEY)); - FREE(*sched, M_CRYPTO_DATA); + free(*sched, M_CRYPTO_DATA); *sched = NULL; } @@ -447,7 +447,7 @@ cast5_setkey(u_int8_t **sched, u_int8_t *key, int len) { int err; - MALLOC(*sched, u_int8_t *, sizeof(cast_key), M_CRYPTO_DATA, M_NOWAIT|M_ZERO); + *sched = malloc(sizeof(cast_key), M_CRYPTO_DATA, M_NOWAIT|M_ZERO); if (*sched != NULL) { cast_setkey((cast_key *)*sched, key, len); err = 0; @@ -460,7 +460,7 @@ static void cast5_zerokey(u_int8_t **sched) { bzero(*sched, sizeof(cast_key)); - FREE(*sched, M_CRYPTO_DATA); + free(*sched, M_CRYPTO_DATA); *sched = NULL; } @@ -482,7 +482,7 @@ skipjack_setkey(u_int8_t **sched, u_int8_t *key, int len) int err; /* NB: allocate all the memory that's needed at once */ - MALLOC(*sched, u_int8_t *, 10 * (sizeof(u_int8_t *) + 0x100), + *sched = malloc(10 * (sizeof(u_int8_t *) + 0x100), M_CRYPTO_DATA, M_NOWAIT|M_ZERO); if (*sched != NULL) { u_int8_t** key_tables = (u_int8_t**) *sched; @@ -504,7 +504,7 @@ static void skipjack_zerokey(u_int8_t **sched) { bzero(*sched, 10 * (sizeof(u_int8_t *) + 0x100)); - FREE(*sched, M_CRYPTO_DATA); + free(*sched, M_CRYPTO_DATA); *sched = NULL; } @@ -528,7 +528,7 @@ rijndael128_setkey(u_int8_t **sched, u_int8_t *key, int len) if (len != 16 && len != 24 && len != 32) return (EINVAL); - MALLOC(*sched, u_int8_t *, sizeof(rijndael_ctx), M_CRYPTO_DATA, + *sched = malloc(sizeof(rijndael_ctx), M_CRYPTO_DATA, M_NOWAIT|M_ZERO); if (*sched != NULL) { rijndael_set_key((rijndael_ctx *) *sched, (u_char *) key, @@ -543,7 +543,7 @@ static void rijndael128_zerokey(u_int8_t **sched) { bzero(*sched, sizeof(rijndael_ctx)); - FREE(*sched, M_CRYPTO_DATA); + free(*sched, M_CRYPTO_DATA); *sched = NULL; } @@ -567,7 +567,7 @@ cml_setkey(u_int8_t **sched, u_int8_t *key, int len) if (len != 16 && len != 24 && len != 32) return (EINVAL); - MALLOC(*sched, u_int8_t *, sizeof(camellia_ctx), M_CRYPTO_DATA, + *sched = malloc(sizeof(camellia_ctx), M_CRYPTO_DATA, M_NOWAIT|M_ZERO); if (*sched != NULL) { camellia_set_key((camellia_ctx *) *sched, (u_char *) key, @@ -582,7 +582,7 @@ static void cml_zerokey(u_int8_t **sched) { bzero(*sched, sizeof(camellia_ctx)); - FREE(*sched, M_CRYPTO_DATA); + free(*sched, M_CRYPTO_DATA); *sched = NULL; } -- cgit v1.1