Commit bc75be24 authored by Ofir Bitton's avatar Ofir Bitton Committed by Oded Gabbay
Browse files

habanalabs: validate packet id during CB parse 



During command buffer parsing, driver extracts packet id
from user buffer. Driver must validate this packet id, since it is
being used in order to extract information from internal structures.

Signed-off-by: default avatarOfir Bitton <obitton@habana.ai>
Reviewed-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent bf6d1096

drivers/misc/habanalabs/gaudi/gaudi.c

+35 −0
Original line number Diff line number Diff line
@@ -154,6 +154,29 @@ static const u16 gaudi_packet_sizes[MAX_PACKET_ID] = { 
	[PACKET_LOAD_AND_EXE]	= sizeof(struct packet_load_and_exe)

};



static inline bool validate_packet_id(enum packet_id id)

{

	switch (id) {

	case PACKET_WREG_32:

	case PACKET_WREG_BULK:

	case PACKET_MSG_LONG:

	case PACKET_MSG_SHORT:

	case PACKET_CP_DMA:

	case PACKET_REPEAT:

	case PACKET_MSG_PROT:

	case PACKET_FENCE:

	case PACKET_LIN_DMA:

	case PACKET_NOP:

	case PACKET_STOP:

	case PACKET_ARB_POINT:

	case PACKET_WAIT:

	case PACKET_LOAD_AND_EXE:

		return true;

	default:

		return false;

	}

}



static const char * const

gaudi_tpc_interrupts_cause[GAUDI_NUM_OF_TPC_INTR_CAUSE] = {

	"tpc_address_exceed_slm",
@@ -3772,6 +3795,12 @@ static int gaudi_validate_cb(struct hl_device *hdev, 
				PACKET_HEADER_PACKET_ID_MASK) >>

					PACKET_HEADER_PACKET_ID_SHIFT);



		if (!validate_packet_id(pkt_id)) {

			dev_err(hdev->dev, "Invalid packet id %u\n", pkt_id);

			rc = -EINVAL;

			break;

		}



		pkt_size = gaudi_packet_sizes[pkt_id];

		cb_parsed_length += pkt_size;

		if (cb_parsed_length > parser->user_cb_size) {
@@ -3995,6 +4024,12 @@ static int gaudi_patch_cb(struct hl_device *hdev, 
				PACKET_HEADER_PACKET_ID_MASK) >>

					PACKET_HEADER_PACKET_ID_SHIFT);



		if (!validate_packet_id(pkt_id)) {

			dev_err(hdev->dev, "Invalid packet id %u\n", pkt_id);

			rc = -EINVAL;

			break;

		}



		pkt_size = gaudi_packet_sizes[pkt_id];

		cb_parsed_length += pkt_size;

		if (cb_parsed_length > parser->user_cb_size) {

drivers/misc/habanalabs/goya/goya.c

+31 −0
Original line number Diff line number Diff line
@@ -139,6 +139,25 @@ static u16 goya_packet_sizes[MAX_PACKET_ID] = { 
	[PACKET_STOP]		= sizeof(struct packet_stop)

};



static inline bool validate_packet_id(enum packet_id id)

{

	switch (id) {

	case PACKET_WREG_32:

	case PACKET_WREG_BULK:

	case PACKET_MSG_LONG:

	case PACKET_MSG_SHORT:

	case PACKET_CP_DMA:

	case PACKET_MSG_PROT:

	case PACKET_FENCE:

	case PACKET_LIN_DMA:

	case PACKET_NOP:

	case PACKET_STOP:

		return true;

	default:

		return false;

	}

}



static u64 goya_mmu_regs[GOYA_MMU_REGS_NUM] = {

	mmDMA_QM_0_GLBL_NON_SECURE_PROPS,

	mmDMA_QM_1_GLBL_NON_SECURE_PROPS,
@@ -3455,6 +3474,12 @@ static int goya_validate_cb(struct hl_device *hdev, 
				PACKET_HEADER_PACKET_ID_MASK) >>

					PACKET_HEADER_PACKET_ID_SHIFT);



		if (!validate_packet_id(pkt_id)) {

			dev_err(hdev->dev, "Invalid packet id %u\n", pkt_id);

			rc = -EINVAL;

			break;

		}



		pkt_size = goya_packet_sizes[pkt_id];

		cb_parsed_length += pkt_size;

		if (cb_parsed_length > parser->user_cb_size) {
@@ -3690,6 +3715,12 @@ static int goya_patch_cb(struct hl_device *hdev, 
				PACKET_HEADER_PACKET_ID_MASK) >>

					PACKET_HEADER_PACKET_ID_SHIFT);



		if (!validate_packet_id(pkt_id)) {

			dev_err(hdev->dev, "Invalid packet id %u\n", pkt_id);

			rc = -EINVAL;

			break;

		}



		pkt_size = goya_packet_sizes[pkt_id];

		cb_parsed_length += pkt_size;

		if (cb_parsed_length > parser->user_cb_size) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE