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 in this calls there are 'sizeof(*root)'
instead of 'sizeof(root)' and 'sizeof(*node)' instead of 'sizeof(node)'.
So memory is allocated for structures instead pointers. This lead to
significant memory overrun.
Looks like it was done for "coverity[suspicious_sizeof] workaround".

Adjust memory overrun by correcting devm_kcalloc() parameters.

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

Fixes: dc49c7723676 ("ice: Get MAC/PHY/link info and scheduler topology")
Signed-off-by: Aleksandr Mishin <amis...@t-argos.ru>
---
 drivers/net/ethernet/intel/ice/ice_sched.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_sched.c 
b/drivers/net/ethernet/intel/ice/ice_sched.c
index ecf8f5d60292..d8b6054f3436 100644
--- a/drivers/net/ethernet/intel/ice/ice_sched.c
+++ b/drivers/net/ethernet/intel/ice/ice_sched.c
@@ -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), 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), GFP_KERNEL);
                if (!node->children) {
                        devm_kfree(ice_hw_to_dev(hw), node);
                        return -ENOMEM;
-- 
2.30.2

Reply via email to