Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f505d49f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: fix barriers support 



Freeing non-slab objects is bad and results in an oops.  Fix it.

Reported-and-tested-by: default avatarAndrew Price <andy@andrewprice.me.uk>
Cc: Theodore Tso <tytso@mit.edu>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d5f840bf

drivers/ide/ide-io.c

+7 −4
Original line number Diff line number Diff line
@@ -102,11 +102,14 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err) 
			drive->dev_flags |= IDE_DFLAG_PARKED;

	}



	if (rq && rq->cmd_type == REQ_TYPE_ATA_TASKFILE)

		memcpy(rq->special, cmd, sizeof(*cmd));

	if (rq && rq->cmd_type == REQ_TYPE_ATA_TASKFILE) {

		struct ide_cmd *orig_cmd = rq->special;



		if (cmd->tf_flags & IDE_TFLAG_DYN)

		kfree(cmd);

			kfree(orig_cmd);

		else

			memcpy(orig_cmd, cmd, sizeof(*cmd));

	}

}



/* obsolete, blk_rq_bytes() should be used instead */