perf/x86/rapl: Prefer struct_size over open coded arithmetic
Subsystems (2)
PATCH 1/1 perf/x86/rapl: Prefer struct_size over open coded arithmetic
This is an effort to get rid of all multiplications from allocation functions in order to prevent integer overflows [1][2].
As the "rapl_pmus" variable is a pointer to "struct rapl_pmus" and this structure ends in a flexible array:
struct rapl_pmus {
[...]
struct rapl_pmu *pmus[] __counted_by(maxdie);
};the preferred way in the kernel is to use the struct_size() helper to do the arithmetic instead of the calculation "size + count * size" in the kzalloc() function.
This way, the code is more readable and safer.
--- arch/x86/events/rapl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/x86/events/rapl.c +1 -3
@@ -675,10 +675,8 @@ static const struct attribute_group *rapl_attr_update[] = {static int __init init_rapl_pmus (void ) {int maxdie =topology_max_packages () *topology_max_dies_per_package (); -size_t size; - size =sizeof (*rapl_pmus) + maxdie *sizeof (struct rapl_pmu *); - rapl_pmus =kzalloc (size,GFP_KERNEL ); + rapl_pmus =kzalloc (struct_size (rapl_pmus, pmus, maxdie),GFP_KERNEL );if (!rapl_pmus)return -ENOMEM ;
--
2.25.1
Quoted 15 lines · Erick Archer
This is an effort to get rid of all multiplications from allocation functions in order to prevent integer overflows [1][2].
As the "
rapl_pmus" variable is a pointer to "structrapl_pmus" and this structure ends in a flexible array:struct rapl_pmus { [...] struct rapl_pmu *pmus[] __counted_by(maxdie); };the preferred way in the kernel is to use the
struct_size()helper to do the arithmetic instead of the calculation "size + count * size" in thekzalloc()function.
Quoted 5 lines
This way, the code is more readable and safer.
LGTM:
Thanks!
--
Gustavo
Quoted 24 lines
--- arch/x86/events/rapl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)arch/x86/events/rapl.c +1
-4@@ -675,10 +675,8 @@ static const struct attribute_group *rapl_attr_update[] = {static int __init init_rapl_pmus (void ) {int maxdie =topology_max_packages () *topology_max_dies_per_package (); -size_t size; - size =sizeof (*rapl_pmus) + maxdie *sizeof (struct rapl_pmu *); - rapl_pmus =kzalloc (size,GFP_KERNEL ); + rapl_pmus =kzalloc (struct_size (rapl_pmus, pmus, maxdie),GFP_KERNEL );if (!rapl_pmus)return -ENOMEM ; --2.25.1
Quoted 15 lines · Erick Archer
This is an effort to get rid of all multiplications from allocation functions in order to prevent integer overflows [1][2].
As the "
rapl_pmus" variable is a pointer to "structrapl_pmus" and this structure ends in a flexible array:struct rapl_pmus { [...] struct rapl_pmu *pmus[] __counted_by(maxdie); };the preferred way in the kernel is to use the
struct_size()helper to do the arithmetic instead of the calculation "size + count * size" in thekzalloc()function.
Quoted 5 lines
This way, the code is more readable and safer.
Thanks!
I was inspired to come up with a Coccinelle script to find this pattern. This seems to do it, though it also removes the blank line. I'm not sure how to stop it from doing that. I'm running this treewide to see if I can find others...
// Options: --no-includes --include-headers
@allocation@
type SIZE_TYPE;
identifier SIZE;
type PTR_TYPE;PTR_TYPE *PTR;
identifier ALLOC =~ "kmalloc|kzalloc|kmalloc_node|kzalloc_node|vmalloc|vzalloc|kvmalloc|kvzalloc"; @@
SIZE_TYPE SIZE; ... PTR = ALLOC(..., SIZE, ...)
@structure@
type allocation.PTR_TYPE;
type FLEX_TYPE;
identifier FLEX;
@@
PTR_TYPE {
...
FLEX_TYPE FLEX[];
...
};@single_shot_sizing@
type allocation.SIZE_TYPE;
identifier allocation.SIZE;
type allocation.PTR_TYPE;PTR_TYPE *allocation.PTR;
identifier allocation.ALLOC;
type structure.FLEX_TYPE;
identifier structure.FLEX;
expression COUNT;
@@
- SIZE_TYPE SIZE;
... when != SIZE
- SIZE = (\(sizeof(*PTR)\|sizeof(PTR_TYPE)\) + ((COUNT) * \(sizeof(*PTR->FLEX)\|sizeof(PTR->FLEX[0])\|sizeof(FLEX_TYPE)\)));
... when != SIZE
PTR = ALLOC(...,
- SIZE
+ struct_size(PTR, FLEX, COUNT)
, ...)
... when != SIZE
@reused_sizing@
type allocation.SIZE_TYPE;
identifier allocation.SIZE;
type allocation.PTR_TYPE;PTR_TYPE *allocation.PTR;
identifier allocation.ALLOC;
type structure.FLEX_TYPE;
identifier structure.FLEX;
expression COUNT;
@@
SIZE_TYPE SIZE;
...
SIZE =
- (\(sizeof(*PTR)\|sizeof(PTR_TYPE)\) + ((COUNT) * \(sizeof(*PTR->FLEX)\|sizeof(PTR->FLEX[0])\|sizeof(FLEX_TYPE)\)))
+ struct_size(PTR, FLEX, COUNT)
;
... when != SIZE
PTR = ALLOC(..., SIZE , ...)
Signature · 1 line
Kees Cook
Quoted 24 lines · Kees Cook
Quoted 15 lines · Erick Archer
This is an effort to get rid of all multiplications from allocation functions in order to prevent integer overflows [1][2].
As the "
rapl_pmus" variable is a pointer to "structrapl_pmus" and this structure ends in a flexible array:struct rapl_pmus { [...] struct rapl_pmu *pmus[] __counted_by(maxdie); };the preferred way in the kernel is to use the
struct_size()helper to do the arithmetic instead of the calculation "size + count * size" in thekzalloc()function.Quoted 5 lines
This way, the code is more readable and safer.
Thanks!
Quoted 8 lines
Reviewed-by Kees Cook <[email protected]>I was inspired to come up with a Coccinelle script to find this pattern. This seems to do it, though it also removes the blank line. I'm not sure how to stop it from doing that. I'm running this treewide to see if I can find others...
// Options: --no-includes --include-headers
with --no-includes this one is missed in arch/x86/events/:
arch/x86/events/intel/uncore.c +3 -4
@@ -350,12 +350,11 @@ static void uncore_pmu_init_hrtimer(struct intel_uncore_box *box)static struct intel_uncore_box *uncore_alloc_box (struct intel_uncore_type *type,int node) { -int i, size, numshared = type->num_shared_regs ; +int i, numshared = type->num_shared_regs ;struct intel_uncore_box *box; - size =sizeof (*box) + numshared *sizeof (struct intel_uncore_extra_reg ); - - box =kzalloc_node (size,GFP_KERNEL , node); + box =kzalloc_node (struct_size (box, shared_regs, numshared), +GFP_KERNEL , node);if (!box)return NULL ;
Funny thing is that in this case it's quite convenient that the script removes the blank like. :P
--
Gustavo
[tip: perf/core] perf/x86/rapl: Prefer struct_size() over open coded arithmetic
In reply to Erick ArcherThe following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: dfbc411e0a5ea72fdd563b2c7d627e9d993d865c Gitweb: https://git.kernel.org/tip/dfbc411e0a5ea72fdd563b2c7d627e9d993d865c Author: Erick Archer <[email protected]> AuthorDate: Sun, 17 Mar 2024 17:44:42 +01:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Thu, 21 Mar 2024 20:58:43 +01:00
perf/x86/rapl: Prefer struct_size() over open coded arithmetic
This is an effort to get rid of all multiplications from allocation functions in order to prevent integer overflows:
https://www.kernel.org/doc/html/latest/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments
https://github.com/KSPP/linux/issues/160
As the "rapl_pmus" variable is a pointer to "struct rapl_pmus" and this structure ends in a flexible array:
struct rapl_pmus {
[...]
struct rapl_pmu *pmus[] __counted_by(maxdie);};
the preferred way in the kernel is to use the struct_size() helper to do the arithmetic instead of the calculation "size + count * size" in the kzalloc() function.
This way, the code is more readable and safer.
--- arch/x86/events/rapl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/x86/events/rapl.c +1 -3
@@ -675,10 +675,8 @@ static const struct attribute_group *rapl_attr_update[] = {static int __init init_rapl_pmus (void ) {int maxdie =topology_max_packages () *topology_max_dies_per_package (); -size_t size; - size =sizeof (*rapl_pmus) + maxdie *sizeof (struct rapl_pmu *); - rapl_pmus =kzalloc (size,GFP_KERNEL ); + rapl_pmus =kzalloc (struct_size (rapl_pmus, pmus, maxdie),GFP_KERNEL );if (!rapl_pmus)return -ENOMEM ;