Commit 1c0ae3cc authored by Vit Stanicek's avatar Vit Stanicek Committed by Henrik Brix Andersen
Browse files

drivers: dma_mcux_lpc: Sanitise chan. data overrun 



Add a num_of_allocated_channels field to struct dma_mcux_lpc_config. Add
a a capacity check for dma_X_channel_data_arr in dma_mcux_lpc_configure.

Signed-off-by: default avatarVit Stanicek <vit.stanicek@nxp.com>
parent 263911d7

drivers/dma/dma_mcux_lpc.c

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ struct dma_mcux_lpc_config { 
	uint32_t otrig_base_address;

	uint32_t itrig_base_address;

	uint8_t num_of_channels;

	uint8_t num_of_allocated_channels;

	uint8_t num_of_otrigs;

	void (*irq_config_func)(const struct device *dev);

};
@@ -529,6 +530,12 @@ static int dma_mcux_lpc_configure(const struct device *dev, uint32_t channel, 


	/* If needed, allocate a slot to store dma channel data */

	if (dma_data->channel_index[channel] == -1) {

		/* Not enough items in channel data array */

		if (dma_data->num_channels_used >= dev_config->num_of_allocated_channels) {

			LOG_ERR("No free DMA channels available");

			return -ENOMEM;

		}



		dma_data->channel_index[channel] = dma_data->num_channels_used;

		dma_data->num_channels_used++;

		/* Get the slot number that has the dma channel data */
@@ -1016,6 +1023,7 @@ static DEVICE_API(dma, dma_mcux_lpc_api) = { 
static const struct dma_mcux_lpc_config dma_##n##_config = {		\

	.base = (DMA_Type *)DT_INST_REG_ADDR(n),			\

	.num_of_channels = DT_INST_PROP(n, dma_channels),		\

	.num_of_allocated_channels = DMA_MCUX_LPC_NUM_USED_CHANNELS(n),	\

	.num_of_otrigs = DT_INST_PROP_OR(n, nxp_dma_num_of_otrigs, 0),			\

	.otrig_base_address = DT_INST_PROP_OR(n, nxp_dma_otrig_base_address, 0x0),	\

	.itrig_base_address = DT_INST_PROP_OR(n, nxp_dma_itrig_base_address, 0x0),	\

CRA Git | Maintained and supported by SUSTech CRA and CCSE