ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thread: Fix error handling in spdk_interrupt_register

Browse Source 
If the calloc failed, the fd was left in the fd_group.

Change-Id: Ie68426a13d342756c20315656f0309440fda6e02
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15475
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Xiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Thanos Makatos <thanos.makatos@nutanix.com>
Reviewed-by: John Levon <levon@movementarian.org>
This commit is contained in:
Ben Walker 2022-11-16 12:43:32 -07:00 committed by Tomasz Zawadzki
parent 8dbaca1300
commit 85478eccc9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/thread/thread.c
View File

@ -2634,14 +2634,6 @@ spdk_interrupt_register(int efd, spdk_interrupt_fn fn,
return NULL; return NULL;
} }
ret = spdk_fd_group_add(thread->fgrp, efd, fn, arg, name);
if (ret != 0) {
SPDK_ERRLOG("thread %s: failed to add fd %d: %s\n",
thread->name, efd, spdk_strerror(-ret));
return NULL;
}
intr = calloc(1, sizeof(*intr)); intr = calloc(1, sizeof(*intr));
if (intr == NULL) { if (intr == NULL) {
SPDK_ERRLOG("Interrupt handler allocation failed\n"); SPDK_ERRLOG("Interrupt handler allocation failed\n");
@ -2657,6 +2649,15 @@ spdk_interrupt_register(int efd, spdk_interrupt_fn fn,
intr->efd = efd; intr->efd = efd;
intr->thread = thread; intr->thread = thread;
ret = spdk_fd_group_add(thread->fgrp, efd, fn, arg, name);
if (ret != 0) {
SPDK_ERRLOG("thread %s: failed to add fd %d: %s\n",
thread->name, efd, spdk_strerror(-ret));
free(intr);
return NULL;
}
return intr; return intr;
} }