| From db02f1703ef6ca519bb5e1043303bdcf32fc97c8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 12 Apr 2022 22:43:59 +0800 |
| Subject: USB: storage: karma: fix rio_karma_init return |
| |
| From: Lin Ma <linma@zju.edu.cn> |
| |
| [ 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: dfe0d3ba20e8 ("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> |
| --- |
| drivers/usb/storage/karma.c | 15 ++++++++------- |
| 1 file changed, 8 insertions(+), 7 deletions(-) |
| |
| diff --git a/drivers/usb/storage/karma.c b/drivers/usb/storage/karma.c |
| index f9d407f0b508..13d77421a915 100644 |
| --- a/drivers/usb/storage/karma.c |
| +++ b/drivers/usb/storage/karma.c |
| @@ -185,23 +185,24 @@ 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; |
| -- |
| 2.35.1 |
| |