From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F80A12FB31; Wed, 19 Jun 2024 13:10:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718802632; cv=none; b=qqq4zfMm0jxnb1BOnZuQU+KSQXhaPW4YNiiEm1pOLkwFndcxtP8gB1cpa3NLHnXaf/hohipn7s9L3vs/RWn8COTeEKh8qiQeTC1R8OVpHHrzyuU0o+wgyxD2uV5a5JoQkR/ecsocJ/Dyt/awGoN/oNzDathZqOlfSLUfFYhHXug= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718802632; c=relaxed/simple; bh=uesf7ynkjS97c6ej9yXWljnepuMeI2WLGImuIzgGbfE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GyViAQ7xNYr+VAAyGjRdGesWE+d1fCxyb+eWmfo69ifXztRsoGq0iOo+Uqbxrrdynlw9cMV4daZI/bibLwkYiFOYlbAtQeFrvXc3nWMTw6x6rwzItfxENiT9DPMoWS12cgLBwUWCLA3Gp6wYtvZ/SkCQ4gjWKDT3iF3wV3+duaw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wS9f5A7P; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wS9f5A7P" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1ED71C2BBFC; Wed, 19 Jun 2024 13:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718802632; bh=uesf7ynkjS97c6ej9yXWljnepuMeI2WLGImuIzgGbfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wS9f5A7PwhdMIulI36BJhak5CQ3H+uQzbStTFqsx4q5Qx7Hde8/b+I5014tNlUZqJ FgpB2oPp6vDdYf569T62IJSxBpNKO+Gv4vB2CwijAF8ew1uoe2NnvT2rBSohNmMU8N 31gMbT7TlflYR8YDz+ab0FlDflfdOpk1uEiHdKvo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, xingwei lee , yue sun , Alan Stern , Shichao Lai , Sasha Levin Subject: [PATCH 6.6 263/267] usb-storage: alauda: Check whether the media is initialized Date: Wed, 19 Jun 2024 14:56:54 +0200 Message-ID: <20240619125616.416757685@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240619125606.345939659@linuxfoundation.org> References: <20240619125606.345939659@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shichao Lai [ Upstream commit 16637fea001ab3c8df528a8995b3211906165a30 ] The member "uzonesize" of struct alauda_info will remain 0 if alauda_init_media() fails, potentially causing divide errors in alauda_read_data() and alauda_write_lba(). - Add a member "media_initialized" to struct alauda_info. - Change a condition in alauda_check_media() to ensure the first initialization. - Add an error check for the return value of alauda_init_media(). Fixes: e80b0fade09e ("[PATCH] USB Storage: add alauda support") Reported-by: xingwei lee Reported-by: yue sun Reviewed-by: Alan Stern Signed-off-by: Shichao Lai Link: https://lore.kernel.org/r/20240526012745.2852061-1-shichaorai@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/storage/alauda.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c index 115f05a6201a1..40d34cc28344a 100644 --- a/drivers/usb/storage/alauda.c +++ b/drivers/usb/storage/alauda.c @@ -105,6 +105,8 @@ struct alauda_info { unsigned char sense_key; unsigned long sense_asc; /* additional sense code */ unsigned long sense_ascq; /* additional sense code qualifier */ + + bool media_initialized; }; #define short_pack(lsb,msb) ( ((u16)(lsb)) | ( ((u16)(msb))<<8 ) ) @@ -476,11 +478,12 @@ static int alauda_check_media(struct us_data *us) } /* Check for media change */ - if (status[0] & 0x08) { + if (status[0] & 0x08 || !info->media_initialized) { usb_stor_dbg(us, "Media change detected\n"); alauda_free_maps(&MEDIA_INFO(us)); - alauda_init_media(us); - + rc = alauda_init_media(us); + if (rc == USB_STOR_TRANSPORT_GOOD) + info->media_initialized = true; info->sense_key = UNIT_ATTENTION; info->sense_asc = 0x28; info->sense_ascq = 0x00; -- 2.43.0