]> git.dujemihanovic.xyz Git - linux.git/commitdiff
drm/xe: Prefer struct_size over open coded arithmetic
authorErick Archer <erick.archer@gmx.com>
Sat, 10 Feb 2024 14:19:12 +0000 (15:19 +0100)
committerLucas De Marchi <lucas.demarchi@intel.com>
Fri, 23 Feb 2024 04:58:20 +0000 (20:58 -0800)
This is an effort to get rid of all multiplications from allocation
functions in order to prevent integer overflows [1].

As the "q" variable is a pointer to "struct xe_exec_queue" and this
structure ends in a flexible array:

struct xe_exec_queue {
[...]
struct xe_lrc lrc[];
};

the preferred way in the kernel is to use the struct_size() helper to
do the arithmetic instead of the argument "size + size * count" in the
kzalloc() function.

This way, the code is more readable and more safer.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments
Link: https://github.com/KSPP/linux/issues/160
Signed-off-by: Erick Archer <erick.archer@gmx.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240210141913.6611-1-erick.archer@gmx.com
drivers/gpu/drm/xe/xe_exec_queue.c

index dda90f0c989031ef7441d17186868f0b2d41d512..4bb8f897bf150280e9dc0de5dd437f72bda92ba4 100644 (file)
@@ -46,7 +46,7 @@ static struct xe_exec_queue *__xe_exec_queue_alloc(struct xe_device *xe,
        /* only kernel queues can be permanent */
        XE_WARN_ON((flags & EXEC_QUEUE_FLAG_PERMANENT) && !(flags & EXEC_QUEUE_FLAG_KERNEL));
 
-       q = kzalloc(sizeof(*q) + sizeof(struct xe_lrc) * width, GFP_KERNEL);
+       q = kzalloc(struct_size(q, lrc, width), GFP_KERNEL);
        if (!q)
                return ERR_PTR(-ENOMEM);