scsi: qedi: remove declaration of nvm_image from stack (872e192f) · Commits · 戴 / test

The nvm_image is a large struct qedi_nvm_iscsi_image object of over 24K so don't declare it on the stack just for a sizeof requirement; use sizeof on struct qedi_nvm_iscsi_image instead. Fixes: ("scsi: qedi: Add the CRC size within iSCSI NVM image") Signed-off-by:

Colin Ian King <colin.king@canonical.com> Acked-by:

Manish Rangankar <mrangankar@marvell.com> Signed-off-by:

Martin K. Petersen <martin.petersen@oracle.com>

drivers/scsi/qedi/qedi_main.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -1392,10 +1392,8 @@ static void qedi_free_nvm_iscsi_cfg(struct qedi_ctx *qedi)

		static int qedi_alloc_nvm_iscsi_cfg(struct qedi_ctx *qedi)
		{
		struct qedi_nvm_iscsi_image nvm_image;

		qedi->iscsi_image = dma_alloc_coherent(&qedi->pdev->dev,
		sizeof(nvm_image),
		sizeof(struct qedi_nvm_iscsi_image),
		&qedi->nvm_buf_dma, GFP_KERNEL);
		if (!qedi->iscsi_image) {
		QEDI_ERR(&qedi->dbg_ctx, "Could not allocate NVM BUF.\n");
		@@ -2236,14 +2234,13 @@ static void qedi_boot_release(void *data)
		static int qedi_get_boot_info(struct qedi_ctx *qedi)
		{
		int ret = 1;
		struct qedi_nvm_iscsi_image nvm_image;

		QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_INFO,
		"Get NVM iSCSI CFG image\n");
		ret = qedi_ops->common->nvm_get_image(qedi->cdev,
		QED_NVM_IMAGE_ISCSI_CFG,
		(char *)qedi->iscsi_image,
		sizeof(nvm_image));
		sizeof(struct qedi_nvm_iscsi_image));
		if (ret)
		QEDI_ERR(&qedi->dbg_ctx,
		"Could not get NVM image. ret = %d\n", ret);

Admin message