Merge tag 'vfio-ccw-20190311' of... (0ba8141f) · Commits · 戴 / test

Merge tag 'vfio-ccw-20190311' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into fixes Pull vfio-ccw from Cornelia Huck with the following changes: - Fix a host crash triggerable by the guest via a channel program.

drivers/s390/cio/vfio_ccw_drv.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -72,12 +72,16 @@ static void vfio_ccw_sch_io_todo(struct work_struct *work)
		{
		struct vfio_ccw_private *private;
		struct irb *irb;
		bool is_final;

		private = container_of(work, struct vfio_ccw_private, io_work);
		irb = &private->irb;

		is_final = !(scsw_actl(&irb->scsw) &
		(SCSW_ACTL_DEVACT \| SCSW_ACTL_SCHACT));
		if (scsw_is_solicited(&irb->scsw)) {
		cp_update_scsw(&private->cp, &irb->scsw);
		if (is_final)
		cp_free(&private->cp);
		}
		memcpy(private->io_region->irb_area, irb, sizeof(*irb));
		@@ -85,7 +89,7 @@ static void vfio_ccw_sch_io_todo(struct work_struct *work)
		if (private->io_trigger)
		eventfd_signal(private->io_trigger, 1);

		if (private->mdev)
		if (private->mdev && is_final)
		private->state = VFIO_CCW_STATE_IDLE;
		}