]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net/mlx5: Add MLX5_FLEXIBLE_INLEN to safely calculate cmd inlen
authorMaxim Mikityanskiy <maximmi@nvidia.com>
Thu, 29 Sep 2022 07:21:45 +0000 (00:21 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 30 Sep 2022 14:55:46 +0000 (07:55 -0700)
Some commands use a flexible array after a common header. Add a macro to
safely calculate the total input length of the command, detecting
overflows and printing errors with specific values when such overflows
happen.

Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h

index ad61b86d57699b1d38d13e4d8b1cbab5c0134c53..a806e3de7b7c321ddb17861951e91d47c92bd881 100644 (file)
@@ -143,6 +143,36 @@ enum mlx5_semaphore_space_address {
 
 #define MLX5_DEFAULT_PROF       2
 
+static inline int mlx5_flexible_inlen(struct mlx5_core_dev *dev, size_t fixed,
+                                     size_t item_size, size_t num_items,
+                                     const char *func, int line)
+{
+       int inlen;
+
+       if (fixed > INT_MAX || item_size > INT_MAX || num_items > INT_MAX) {
+               mlx5_core_err(dev, "%s: %s:%d: input values too big: %zu + %zu * %zu\n",
+                             __func__, func, line, fixed, item_size, num_items);
+               return -ENOMEM;
+       }
+
+       if (check_mul_overflow((int)item_size, (int)num_items, &inlen)) {
+               mlx5_core_err(dev, "%s: %s:%d: multiplication overflow: %zu + %zu * %zu\n",
+                             __func__, func, line, fixed, item_size, num_items);
+               return -ENOMEM;
+       }
+
+       if (check_add_overflow((int)fixed, inlen, &inlen)) {
+               mlx5_core_err(dev, "%s: %s:%d: addition overflow: %zu + %zu * %zu\n",
+                             __func__, func, line, fixed, item_size, num_items);
+               return -ENOMEM;
+       }
+
+       return inlen;
+}
+
+#define MLX5_FLEXIBLE_INLEN(dev, fixed, item_size, num_items) \
+       mlx5_flexible_inlen(dev, fixed, item_size, num_items, __func__, __LINE__)
+
 int mlx5_query_hca_caps(struct mlx5_core_dev *dev);
 int mlx5_query_board_id(struct mlx5_core_dev *dev);
 int mlx5_cmd_init(struct mlx5_core_dev *dev);