From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 E5F322E7379; Thu, 28 May 2026 20:27:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780000071; cv=none; b=AJEsonW2Tkp8Hzwf3K/Eogt03gWYvrYIlxsx+xkcCLXOsrry5BiHhf8Wp4mQSoEL+6YyE4XirvULql93GtJrN/hOP4qjsLsBJgWT2oFFsq2T8RRAgpbQUeZO0DLBmVQbv9xpFw81h5ArRaZDGvRpBBrGNSrcnkkagbAN/QDTR8M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780000071; c=relaxed/simple; bh=pOUbmcUVF983iuXdbHFte8XQ1oVo7Nv0Gn5nTfcRXaw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mj8rdh/uiGc7Vo/JkBtw2XaiE0Y+kl+jZ2GnxNtujw4yCbmzcVbvMzt+/sUeGciRTVM1QZYSjOSe1yWoofHrS9fLSnrUpdRF0d8UpISN6vCrhpZ1zLTqGsHFqN60artzqd/PgqbCZONmj/riLnXaRaKqIKt7DG2qQQY9/SV0QnQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LduPH1TH; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LduPH1TH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 503CF1F000E9; Thu, 28 May 2026 20:27:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780000070; bh=Vg+M71KiyBhCMKb4DfGmLtg3Rhcs1h5rLEGkw72CIAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LduPH1TH3UrRx6OWfQ4gIhWXqp7k88EY0rebd5LNLUAEBhUb5Dx/NQLBXESNiapMO QjBoCPM5zdSzu7i5IXjRymyGMXWUGzh5t5/UoCVVBxvzo9wamEPtpFC1ME9RrDC+KV mdp8QKMEcvLJd8scIP/tya8R2WqD/e0S2mnxR0A8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Mike Christie , Bart Van Assche , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.18 292/377] scsi: sd: Fix return code handling in sd_spinup_disk() Date: Thu, 28 May 2026 21:48:50 +0200 Message-ID: <20260528194646.801736709@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@linuxfoundation.org> User-Agent: quilt/0.69 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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mike Christie [ Upstream commit 6ea68a8dc7d2711504d944811981a5304af7d7a9 ] As found by smatch-ci, scsi_execute_cmd() can return negative or positve values so we should use a int instead of unsigned int. Fixes: b4d0c33a32c3 ("scsi: sd: Fix sshdr use in sd_spinup_disk") Reported-by: Dan Carpenter Closes: https://lore.kernel.org/linux-scsi/agFbI7E6JQwd3wGW@stanley.mountain/T/#u Signed-off-by: Mike Christie Reviewed-by: Bart Van Assche Link: https://patch.msgid.link/20260511175317.114007-1-michael.christie@oracle.com Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/sd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 072d4c4add334..d9bae23cb929e 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2398,8 +2398,7 @@ sd_spinup_disk(struct scsi_disk *sdkp) { static const u8 cmd[10] = { TEST_UNIT_READY }; unsigned long spintime_expire = 0; - int spintime, sense_valid = 0; - unsigned int the_result; + int the_result, spintime, sense_valid = 0; struct scsi_sense_hdr sshdr; struct scsi_failure failure_defs[] = { /* Do not retry Medium Not Present */ -- 2.53.0