On 09/11/2009 10:20 PM, Martin K. Petersen wrote:
> We would leak a scsi_data_buffer if the free_list command was of the
> protected variety.
>
> Reported-by: Boaz Harrosh <bharrosh@xxxxxxxxxxx>
Reviewed-by: Boaz Harrosh <bharrosh@xxxxxxxxxxx>
I like the locality of the temp variables, thanks.
> Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
> ---
> drivers/scsi/scsi.c | 11 +++++++----
> 1 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
> index 2de5f3a..69397bb 100644
> --- a/drivers/scsi/scsi.c
> +++ b/drivers/scsi/scsi.c
> @@ -241,10 +241,7 @@ scsi_host_alloc_command(struct Scsi_Host *shost, gfp_t gfp_mask)
> */
> struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)
> {
> - struct scsi_cmnd *cmd;
> - unsigned char *buf;
> -
> - cmd = scsi_host_alloc_command(shost, gfp_mask);
> + struct scsi_cmnd *cmd = scsi_host_alloc_command(shost, gfp_mask);
>
> if (unlikely(!cmd)) {
> unsigned long flags;
> @@ -258,9 +255,15 @@ struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)
> spin_unlock_irqrestore(&shost->free_list_lock, flags);
>
> if (cmd) {
> + void *buf, *prot;
> +
> buf = cmd->sense_buffer;
> + prot = cmd->prot_sdb;
> +
> memset(cmd, 0, sizeof(*cmd));
> +
> cmd->sense_buffer = buf;
> + cmd->prot_sdb = prot;
> }
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
