staging: tidspbridge: Clean up error-handling code (cc58cbb8) · Commits · 戴 / test

In the first hunk, 0 is returned on memory allocation failure, even though other failures return -ENOMEM or other similar values. In the second hunk, there was error handling code that returned without freeing psz_path_name. A simplified version of the semantic match that finds the first problem is as follows: (http://coccinelle.lip6.fr/ ) // <smpl> @@ expression ret; expression x,e1,e2,e3; @@ ret = 0 ... when != ret = e1 *x = \(kmalloc\|kcalloc\|kzalloc\)(...) ... when != ret = e2 if (x == NULL) { ... when != ret = e3 return ret; } // </smpl> Signed-off-by:

Julia Lawall <julia@diku.dk> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/tidspbridge/pmgr/dspapi.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -493,8 +493,10 @@ u32 mgrwrap_register_object(union trapped_args args, void pr_ctxt)
		args->args_mgr_registerobject.psz_path_name) +
		1;
		psz_path_name = kmalloc(path_size, GFP_KERNEL);
		if (!psz_path_name)
		if (!psz_path_name) {
		status = -ENOMEM;
		goto func_end;
		}
		ret = strncpy_from_user(psz_path_name,
		(char *)args->args_mgr_registerobject.
		psz_path_name, path_size);
		@@ -503,8 +505,10 @@ u32 mgrwrap_register_object(union trapped_args args, void pr_ctxt)
		goto func_end;
		}

		if (args->args_mgr_registerobject.obj_type >= DSP_DCDMAXOBJTYPE)
		return -EINVAL;
		if (args->args_mgr_registerobject.obj_type >= DSP_DCDMAXOBJTYPE) {
		status = -EINVAL;
		goto func_end;
		}

		status = dcd_register_object(&uuid_obj,
		args->args_mgr_registerobject.obj_type,

Admin message