Commit 3d1995c3 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Changpeng Liu
Browse files

thread: Use not malloc'ed but fixed size string for IO device name 



256 bytes will be enough but not too large for the name of SPDK IO
device. Use fixed size string for the name of SPDK IO device and
reduce the potential malloc failure. If the length of passed name
is longer then 256, it will be cut off without error.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I618b82a1d07769df7c775280fbf364cbcfdde403
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459721


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
parent 09013306

lib/thread/thread.c

+4 −6
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "spdk_internal/thread.h"



#define SPDK_MSG_BATCH_SIZE		8

#define SPDK_MAX_DEVICE_NAME_LEN	256

#define SPDK_MAX_THREAD_NAME_LEN	256



static pthread_mutex_t g_devlist_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -52,7 +53,7 @@ static size_t g_ctx_sz = 0; 


struct io_device {

	void				*io_device;

	char				*name;

	char				name[SPDK_MAX_DEVICE_NAME_LEN + 1];

	spdk_io_channel_create_cb	create_cb;

	spdk_io_channel_destroy_cb	destroy_cb;

	spdk_io_device_unregister_cb	unregister_cb;
@@ -865,9 +866,9 @@ spdk_io_device_register(void *io_device, spdk_io_channel_create_cb create_cb, 


	dev->io_device = io_device;

	if (name) {

		dev->name = strdup(name);

		snprintf(dev->name, sizeof(dev->name), "%s", name);

	} else {

		dev->name = spdk_sprintf_alloc("%p", dev);

		snprintf(dev->name, sizeof(dev->name), "%p", dev);

	}

	dev->create_cb = create_cb;

	dev->destroy_cb = destroy_cb;
@@ -885,7 +886,6 @@ spdk_io_device_register(void *io_device, spdk_io_channel_create_cb create_cb, 
		if (tmp->io_device == io_device) {

			SPDK_ERRLOG("io_device %p already registered (old:%s new:%s)\n",

				    io_device, tmp->name, dev->name);

			free(dev->name);

			free(dev);

			pthread_mutex_unlock(&g_devlist_mutex);

			return;
@@ -904,7 +904,6 @@ _finish_unregister(void *arg) 
		      dev->name, dev->io_device, dev->unregister_thread->name);



	dev->unregister_cb(dev->io_device);

	free(dev->name);

	free(dev);

}
@@ -912,7 +911,6 @@ static void 
_spdk_io_device_free(struct io_device *dev)

{

	if (dev->unregister_cb == NULL) {

		free(dev->name);

		free(dev);

	} else {

		assert(dev->unregister_thread != NULL);