[SCSI] megaraid: fix mega_internal_command oops (6b0eea21) · Commits · 戴 / test

scsi_cmnd->cmnd was changed from a static array to a pointer post 2.6.25. It breaks mega_internal_command(): static int mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) { ... scb = &adapter->int_scb; memset(scb, 0, sizeof(scb_t)); scmd = &adapter->int_scmd; memset(scmd, 0, sizeof(Scsi_Cmnd)); sdev = kzalloc(sizeof(struct scsi_device), GFP_KERNEL); scmd->device = sdev; scmd->device->host = adapter->host; scmd->host_scribble = (void *)scb; scmd->cmnd[0] = MEGA_INTERNAL_CMD; mega_internal_command() uses scsi_cmnd allocated internally so scmd->cmnd is NULL here. This patch adds a static array for cdb to adapter_t and uses it here. This also uses scsi_allocate_command/scsi_free_command, the recommended way to allocate struct scsi_cmnd since the driver might use sense_buffer in struct scsi_cmnd. Signed-off-by:

FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by:

Boaz Harrosh <bharrosh@panasas.com> Tested-by:

Pascal Terjan <pterjan@gmail.com> Reported-by:

Pascal Terjan <pterjan@gmail.com> Acked-by:

"Yang, Bo" <Bo.Yang@lsi.com> Signed-off-by:

James Bottomley <James.Bottomley@HansenPartnership.com>

drivers/scsi/megaraid.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -4402,6 +4402,10 @@ mega_internal_command(adapter_t adapter, megacmd_t mc, mega_passthru *pthru)
		scb_t *scb;
		int rval;

		scmd = scsi_allocate_command(GFP_KERNEL);
		if (!scmd)
		return -ENOMEM;

		/*
		* The internal commands share one command id and hence are
		* serialized. This is so because we want to reserve maximum number of
		@@ -4412,12 +4416,11 @@ mega_internal_command(adapter_t adapter, megacmd_t mc, mega_passthru *pthru)
		scb = &adapter->int_scb;
		memset(scb, 0, sizeof(scb_t));

		scmd = &adapter->int_scmd;
		memset(scmd, 0, sizeof(Scsi_Cmnd));

		sdev = kzalloc(sizeof(struct scsi_device), GFP_KERNEL);
		scmd->device = sdev;

		memset(adapter->int_cdb, 0, sizeof(adapter->int_cdb));
		scmd->cmnd = adapter->int_cdb;
		scmd->device->host = adapter->host;
		scmd->host_scribble = (void *)scb;
		scmd->cmnd[0] = MEGA_INTERNAL_CMD;
		@@ -4456,6 +4459,8 @@ mega_internal_command(adapter_t adapter, megacmd_t mc, mega_passthru *pthru)

		mutex_unlock(&adapter->int_mtx);

		scsi_free_command(GFP_KERNEL, scmd);

		return rval;
		}

drivers/scsi/megaraid.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -888,8 +888,8 @@ typedef struct {

		u8 sglen; /* f/w supported scatter-gather list length */

		unsigned char int_cdb[MAX_COMMAND_SIZE];
		scb_t int_scb;
		Scsi_Cmnd int_scmd;
		struct mutex int_mtx; /* To synchronize the internal
		commands */
		struct completion int_waitq; /* wait queue for internal

Admin message