Commit 49ed6573 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  ide-tape: Don't leak kernel stack information
  ide: fix memory leak when flush command is issued
parents 402168ce 2fc2111c

drivers/ide/ide-disk.c

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ static void idedisk_prepare_flush(struct request_queue *q, struct request *rq) 


	rq->cmd_type = REQ_TYPE_ATA_TASKFILE;

	rq->special = cmd;

	cmd->rq = rq;

}



ide_devset_get(multcount, mult_count);

drivers/ide/ide-tape.c

+1 −0
Original line number Diff line number Diff line
@@ -1064,6 +1064,7 @@ static int idetape_blkdev_ioctl(ide_drive_t *drive, unsigned int cmd, 
		tape->best_dsc_rw_freq = config.dsc_rw_frequency;

		break;

	case 0x0350:

		memset(&config, 0, sizeof(config));

		config.dsc_rw_frequency = (int) tape->best_dsc_rw_freq;

		config.nr_stages = 1;

		if (copy_to_user(argp, &config, sizeof(config)))