]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ice: Adjust over allocation of memory in ice_sched_add_root_node() and ice_sched_add_...
authorAleksandr Mishin <amishin@t-argos.ru>
Wed, 10 Jul 2024 12:39:49 +0000 (15:39 +0300)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Mon, 26 Aug 2024 16:49:57 +0000 (09:49 -0700)
In ice_sched_add_root_node() and ice_sched_add_node() there are calls to
devm_kcalloc() in order to allocate memory for array of pointers to
'ice_sched_node' structure. But incorrect types are used as sizeof()
arguments in these calls (structures instead of pointers) which leads to
over allocation of memory.

Adjust over allocation of memory by correcting types in devm_kcalloc()
sizeof() arguments.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/ice/ice_sched.c

index ecf8f5d60292197781e55603ff32f03c724a45bf..6ca13c5dcb14e7cdbfc7d6fe61179916ae9b38d3 100644 (file)
@@ -28,9 +28,8 @@ ice_sched_add_root_node(struct ice_port_info *pi,
        if (!root)
                return -ENOMEM;
 
-       /* coverity[suspicious_sizeof] */
        root->children = devm_kcalloc(ice_hw_to_dev(hw), hw->max_children[0],
-                                     sizeof(*root), GFP_KERNEL);
+                                     sizeof(*root->children), GFP_KERNEL);
        if (!root->children) {
                devm_kfree(ice_hw_to_dev(hw), root);
                return -ENOMEM;
@@ -186,10 +185,9 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer,
        if (!node)
                return -ENOMEM;
        if (hw->max_children[layer]) {
-               /* coverity[suspicious_sizeof] */
                node->children = devm_kcalloc(ice_hw_to_dev(hw),
                                              hw->max_children[layer],
-                                             sizeof(*node), GFP_KERNEL);
+                                             sizeof(*node->children), GFP_KERNEL);
                if (!node->children) {
                        devm_kfree(ice_hw_to_dev(hw), node);
                        return -ENOMEM;