Merge pull request #1175 from mmichal10/secure-fixes

Fixes for Coverity static analysis tool findings
Open-CAS · Apr 8, 2022 · 954d2be · 954d2be
2 parents 5854e37 + 8fae9e2
commit 954d2be
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/modules/cas_cache/classifier.c b/modules/cas_cache/classifier.c
@@ -203,6 +203,10 @@ static int _cas_cls_string_ctr(struct cas_classifier *cls,
 		CAS_CLS_MSG(KERN_ERR, "String specifier is empty\n");
 		return -EINVAL;
 	}
+	if (len == MAX_STRING_SPECIFIER_LEN) {
+		CAS_CLS_MSG(KERN_ERR, "String specifier is too long\n");
+		return -EINVAL;
+	}
 
 	ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
 	if (!ctx)

diff --git a/modules/cas_cache/ocf_env.c b/modules/cas_cache/ocf_env.c
@@ -43,7 +43,7 @@ struct _env_allocator_item {
 void *env_allocator_new(env_allocator *allocator)
 {
 	struct _env_allocator_item *item = NULL;
-	int cpu;
+	int cpu = 0;
 
 	if (allocator->rpool)
 		item = cas_rpool_try_get(allocator->rpool, &cpu);

diff --git a/modules/cas_cache/volume/vol_blk_utils.c b/modules/cas_cache/volume/vol_blk_utils.c
@@ -241,7 +241,9 @@ int cas_blk_open_volume_by_bdev(ocf_volume_t *vol, struct block_device *bdev)
 	bdobj->btm_bd = bdev;
 	bdobj->opened_by_bdev = true;
 
-	return ocf_volume_open(*vol, NULL);
+	ret = ocf_volume_open(*vol, NULL);
+	if (ret)
+		ocf_volume_destroy(*vol);
 
 err:
 	return ret;

diff --git a/modules/cas_cache/volume/vol_block_dev_top.c b/modules/cas_cache/volume/vol_block_dev_top.c
@@ -742,8 +742,10 @@ static int kcas_core_stop_exported_object(ocf_core_t core, void *cntx)
 			casdisk_functions.casdsk_exp_obj_get_gendisk(bvol->dsk)->disk_name);
 
 		ret = casdisk_functions.casdsk_exp_obj_destroy(bvol->dsk);
-		if (!ret)
+		if (!ret) {
 			bvol->expobj_valid = false;
+			destroy_workqueue(bvol->expobj_wq);
+		}
 	}
 
 	if (bvol->expobj_locked) {

diff --git a/ocf b/ocf
+6 −4		src/mngt/ocf_mngt_core.c
+1 −1		src/mngt/ocf_mngt_core_pool.c
+0 −3		src/mngt/ocf_mngt_flush.c
+9 −3		src/ocf_volume.c