Commit b7849977 authored Apr 12, 2022 by Lin Ma Committed by Greg Kroah-Hartman Jun 14, 2022

USB: storage: karma: fix rio_karma_init return



[ Upstream commit b92ffb1eddd9a66a90defc556dcbf65a43c196c7 ]

The function rio_karam_init() should return -ENOMEM instead of
value 0 (USB_STOR_TRANSPORT_GOOD) when allocation fails.

Similarly, it should return -EIO when rio_karma_send_command() fails.

Fixes: dfe0d3ba ("USB Storage: add rio karma eject support")
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Lin Ma <linma@zju.edu.cn>
Link: https://lore.kernel.org/r/20220412144359.28447-1-linma@zju.edu.cn


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 72ab0f6f

drivers/usb/storage/karma.c

+8 −7

Original line number	Diff line number	Diff line
		@@ -174,24 +174,25 @@ static void rio_karma_destructor(void *extra)

		static int rio_karma_init(struct us_data *us)
		{
		int ret = 0;
		struct karma_data *data = kzalloc(sizeof(struct karma_data), GFP_NOIO);

		if (!data)
		goto out;
		return -ENOMEM;

		data->recv = kmalloc(RIO_RECV_LEN, GFP_NOIO);
		if (!data->recv) {
		kfree(data);
		goto out;
		return -ENOMEM;
		}

		us->extra = data;
		us->extra_destructor = rio_karma_destructor;
		ret = rio_karma_send_command(RIO_ENTER_STORAGE, us);
		data->in_storage = (ret == 0);
		out:
		return ret;
		if (rio_karma_send_command(RIO_ENTER_STORAGE, us))
		return -EIO;

		data->in_storage = 1;

		return 0;
		}

		static struct scsi_host_template karma_host_template;