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

Commit a24484f2 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by James Bottomley
Browse files

[SCSI] sg: set class_data after success 



If cdev_add fails in sg_add, sg_remove crashes since class_data is
bogus.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarDouglas Gilbert <dougg@torque.net>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent d814c517

drivers/scsi/sg.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1422,7 +1422,6 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf) 
		goto out;

		goto out;

	}

	}





	class_set_devdata(cl_dev, sdp);

	error = cdev_add(cdev, MKDEV(SCSI_GENERIC_MAJOR, sdp->index), 1);

	error = cdev_add(cdev, MKDEV(SCSI_GENERIC_MAJOR, sdp->index), 1);

	if (error)

	if (error)

		goto cdev_add_err;

		goto cdev_add_err;
@@ -1451,6 +1450,8 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf) 
		    "Attached scsi generic sg%d type %d\n", sdp->index,

		    "Attached scsi generic sg%d type %d\n", sdp->index,

		    scsidp->type);

		    scsidp->type);





	class_set_devdata(cl_dev, sdp);



	return 0;

	return 0;





cdev_add_err:

cdev_add_err: