AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

USB: storage: karma: fix rio_karma_init return

Browse Source 
[ 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: dfe0d3ba20 ("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>
This commit is contained in:
Lin Ma 2022-04-12 22:43:59 +08:00 committed by Greg Kroah-Hartman
parent e100742823
commit 6b7cf22122
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/usb/storage/karma.c
View File

@ -174,24 +174,25 @@ static void rio_karma_destructor(void *extra)
static int rio_karma_init(struct us_data *us) static int rio_karma_init(struct us_data *us)
{ {
int ret = 0;
struct karma_data *data = kzalloc(sizeof(struct karma_data), GFP_NOIO); struct karma_data *data = kzalloc(sizeof(struct karma_data), GFP_NOIO);
if (!data) if (!data)
goto out; return -ENOMEM;
data->recv = kmalloc(RIO_RECV_LEN, GFP_NOIO); data->recv = kmalloc(RIO_RECV_LEN, GFP_NOIO);
if (!data->recv) { if (!data->recv) {
kfree(data); kfree(data);
goto out; return -ENOMEM;
} }
us->extra = data; us->extra = data;
us->extra_destructor = rio_karma_destructor; us->extra_destructor = rio_karma_destructor;
ret = rio_karma_send_command(RIO_ENTER_STORAGE, us); if (rio_karma_send_command(RIO_ENTER_STORAGE, us))
data->in_storage = (ret == 0); return -EIO;
out:
return ret; data->in_storage = 1;
return 0;
} }
static struct scsi_host_template karma_host_template; static struct scsi_host_template karma_host_template;