Mercurial > illumos > git > illumos-omnios
changeset 21109:6d3cf4366aea
10725 sol_ucma: NULL pointer errors
Reviewed by: Sebastian Wiedenroth <sebastian.wiedenroth@skylime.net>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| author | Toomas Soome <tsoome@me.com> |
|---|---|
| date | Sat, 19 Jan 2019 19:53:30 +0200 |
| parents | f540c133713a |
| children | 4fa88b9b74fa |
| files | usr/src/uts/common/io/ib/clients/of/sol_ucma/sol_ucma.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/io/ib/clients/of/sol_ucma/sol_ucma.c Sat Jan 19 19:33:46 2019 +0200 +++ b/usr/src/uts/common/io/ib/clients/of/sol_ucma/sol_ucma.c Sat Jan 19 19:53:30 2019 +0200 @@ -867,7 +867,7 @@ static int sol_ucma_destroy_id(dev_t dev, void *io_buf, struct uio *uio) { - sol_ucma_chan_t *chanp; + sol_ucma_chan_t *chanp; uint32_t ucma_id; sol_ucma_file_t *filep; sol_ucma_destroy_id_t *id_inp; @@ -1488,7 +1488,7 @@ bcopy((void *)(&(join_buf->addr)), (void *)(&(mcastp->mcast_addr)), sizeof (struct sockaddr)); mcastp->mcast_chan = chanp; - sol_ofs_uobj_init(&mcastp->mcast_uobj, NULL, SOL_UCMA_MCAST_TYPE); + sol_ofs_uobj_init(&mcastp->mcast_uobj, 0, SOL_UCMA_MCAST_TYPE); if (sol_ofs_uobj_add(&ucma_mcast_uo_tbl, &mcastp->mcast_uobj) != 0) { sol_ofs_uobj_free(&mcastp->mcast_uobj); return (ENOMEM); @@ -1768,7 +1768,7 @@ sol_ucma_file_t *new_file; new_file = kmem_zalloc(sizeof (sol_ucma_file_t), KM_SLEEP); - sol_ofs_uobj_init(&new_file->file_uobj, NULL, SOL_UCMA_EVT_FILE_TYPE); + sol_ofs_uobj_init(&new_file->file_uobj, 0, SOL_UCMA_EVT_FILE_TYPE); if (sol_ofs_uobj_add(&ucma_file_uo_tbl, &new_file->file_uobj) != 0) { sol_ofs_uobj_free(&new_file->file_uobj); return (NULL); @@ -1805,7 +1805,7 @@ filep, create_id_inp); new_chanp = kmem_zalloc(sizeof (sol_ucma_chan_t), KM_SLEEP); - sol_ofs_uobj_init(&new_chanp->chan_uobj, NULL, SOL_UCMA_CM_ID_TYPE); + sol_ofs_uobj_init(&new_chanp->chan_uobj, 0, SOL_UCMA_CM_ID_TYPE); if (sol_ofs_uobj_add(&ucma_ctx_uo_tbl, &new_chanp->chan_uobj) != 0) { sol_ofs_uobj_free(&new_chanp->chan_uobj); return (NULL);