crypto: qat - validate slices count returned by FW

The function adf_send_admin_tl_start() enables the telemetry (TL)
feature on a QAT device by sending the ICP_QAT_FW_TL_START message to
the firmware. This triggers the FW to start writing TL data to a DMA
buffer in memory and returns an array containing the number of
accelerators of each type (slices) supported by this HW.
The pointer to this array is stored in the adf_tl_hw_data data
structure called slice_cnt.

The array slice_cnt is then used in the function tl_print_dev_data()
to report in debugfs only statistics about the supported accelerators.
An incorrect value of the elements in slice_cnt might lead to an out
of bounds memory read.
At the moment, there isn't an implementation of FW that returns a wrong
value, but for robustness validate the slice count array returned by FW.

Fixes: 69e7649f7cc2 ("crypto: qat - add support for device telemetry")
Signed-off-by: Lucas Segarra Fernandez <lucas.segarra.fernandez@intel.com>
Reviewed-by: Damian Muszynski <damian.muszynski@intel.com>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/intel/qat/qat_common/adf_gen4_tl.c b/drivers/crypto/intel/qat/qat_common/adf_gen4_tl.c
index 7fc7a77f6aed93e3d56efea23d94ae5a3b5a995f..c7ad8cf07863b16e05ab727f6f43b05feb69c106 100644 (file)
--- a/drivers/crypto/intel/qat/qat_common/adf_gen4_tl.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_gen4_tl.c
@@ -149,5 +149,6 @@ void adf_gen4_init_tl_data(struct adf_tl_hw_data *tl_data)
        tl_data->sl_exec_counters = sl_exec_counters;
        tl_data->rp_counters = rp_counters;
        tl_data->num_rp_counters = ARRAY_SIZE(rp_counters);
+       tl_data->max_sl_cnt = ADF_GEN4_TL_MAX_SLICES_PER_TYPE;
 }
 EXPORT_SYMBOL_GPL(adf_gen4_init_tl_data);

diff --git a/drivers/crypto/intel/qat/qat_common/adf_telemetry.c b/drivers/crypto/intel/qat/qat_common/adf_telemetry.c
index 2ff714d11bd2f6aa6a634b6d656ae03d83fe4a69..74fb0c2ed2412af543c2803d1b6ade84ffc95486 100644 (file)
--- a/drivers/crypto/intel/qat/qat_common/adf_telemetry.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_telemetry.c
@@ -41,6 +41,20 @@ static int validate_tl_data(struct adf_tl_hw_data *tl_data)
        return 0;
 }
 
+static int validate_tl_slice_counters(struct icp_qat_fw_init_admin_slice_cnt *slice_count,
+                                     u8 max_slices_per_type)
+{
+       u8 *sl_counter = (u8 *)slice_count;
+       int i;
+
+       for (i = 0; i < ADF_TL_SL_CNT_COUNT; i++) {
+               if (sl_counter[i] > max_slices_per_type)
+                       return -EINVAL;
+       }
+
+       return 0;
+}
+
 static int adf_tl_alloc_mem(struct adf_accel_dev *accel_dev)
 {
        struct adf_tl_hw_data *tl_data = &GET_TL_DATA(accel_dev);
@@ -214,6 +228,13 @@ int adf_tl_run(struct adf_accel_dev *accel_dev, int state)
                return ret;
        }
 
+       ret = validate_tl_slice_counters(&telemetry->slice_cnt, tl_data->max_sl_cnt);
+       if (ret) {
+               dev_err(dev, "invalid value returned by FW\n");
+               adf_send_admin_tl_stop(accel_dev);
+               return ret;
+       }
+
        telemetry->hbuffs = state;
        atomic_set(&telemetry->state, state);
 

diff --git a/drivers/crypto/intel/qat/qat_common/adf_telemetry.h b/drivers/crypto/intel/qat/qat_common/adf_telemetry.h
index 9be81cd3b886064ca24cd946346e0f344e1f4251..e54a406cc1b4aec9313fca253b1685f967880813 100644 (file)
--- a/drivers/crypto/intel/qat/qat_common/adf_telemetry.h
+++ b/drivers/crypto/intel/qat/qat_common/adf_telemetry.h
@@ -40,6 +40,7 @@ struct adf_tl_hw_data {
        u8 num_dev_counters;
        u8 num_rp_counters;
        u8 max_rp;
+       u8 max_sl_cnt;
 };
 
 struct adf_telemetry {