staging: vchiq_dev: Avoid unnecessary alloc in vchiq_ioc_create_service

There is no need to allocate the user service in case there is a VCHIQ
connection required, but not available. So simply check the error conditions
before doing an expensive memory allocation.

Reviewed-by: Nicolas Saenz Julienne <nsaenz@kernel.org>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1642968143-19281-19-git-send-email-stefan.wahren@i2se.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
index 2325844b08806db031037e5423ee81524ff7df3f..b41c2a2673550510d0190f836710f12b7615b005 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
@@ -146,15 +146,14 @@ static int vchiq_ioc_create_service(struct vchiq_instance *instance,
        struct vchiq_service_params_kernel params;
        int srvstate;
 
+       if (args->is_open && !instance->connected)
+               return -ENOTCONN;
+
        user_service = kmalloc(sizeof(*user_service), GFP_KERNEL);
        if (!user_service)
                return -ENOMEM;
 
        if (args->is_open) {
-               if (!instance->connected) {
-                       kfree(user_service);
-                       return -ENOTCONN;
-               }
                srvstate = VCHIQ_SRVSTATE_OPENING;
        } else {
                srvstate = instance->connected ?