Merge tag 'overflow-v4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[linux.git] / drivers / s390 / cio / ccwgroup.c

diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index db9c854088bc88d1aab8f67346b2596416c6b76a..93b2862bd3faecbc5702759855db207c43c49f17 100644 (file)
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -326,8 +326,7 @@ int ccwgroup_create_dev(struct device *parent, struct ccwgroup_driver *gdrv,
        if (num_devices < 1)
                return -EINVAL;
 
-       gdev = kzalloc(sizeof(*gdev) + num_devices * sizeof(gdev->cdev[0]),
-                      GFP_KERNEL);
+       gdev = kzalloc(struct_size(gdev, cdev, num_devices), GFP_KERNEL);
        if (!gdev)
                return -ENOMEM;