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

Commit fab2536b authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

usb: storage: Add check for kcalloc 



[ Upstream commit c35ca10f53c51eeb610d3f8fbc6dd6d511b58a58 ]

As kcalloc may return NULL pointer, the return value should
be checked and return error if fails as same as the ones in
alauda_read_map.

Fixes: e80b0fad ("[PATCH] USB Storage: add alauda support")
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20221208110058.12983-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent cdcbae2c

drivers/usb/storage/alauda.c

+2 −0
Original line number Diff line number Diff line
@@ -438,6 +438,8 @@ static int alauda_init_media(struct us_data *us) 
		+ MEDIA_INFO(us).blockshift + MEDIA_INFO(us).pageshift);

	MEDIA_INFO(us).pba_to_lba = kcalloc(num_zones, sizeof(u16*), GFP_NOIO);

	MEDIA_INFO(us).lba_to_pba = kcalloc(num_zones, sizeof(u16*), GFP_NOIO);

	if (MEDIA_INFO(us).pba_to_lba == NULL || MEDIA_INFO(us).lba_to_pba == NULL)

		return USB_STOR_TRANSPORT_ERROR;



	if (alauda_reset_media(us) != USB_STOR_XFER_GOOD)

		return USB_STOR_TRANSPORT_ERROR;