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 C708D442FDA; Thu, 20 Aug 2026 17:44:54 +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=1787247895; cv=none; b=X8w/RXp6Q0UARECSk2eO7eS5rEHYlvTZqt/n1PYkQ/V9bscB8HknqaQSx7AL3LxoWyn4ga44FrDvgjunSlm2nsDQV8wXBkeJkIjWWsOA1h+hqfXUum9ZT6nwOTuqVNpJJs1Vq1lRX57pxf7zzWXimCzfEUbA9g+s54aVWrjMhGM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787247895; c=relaxed/simple; bh=gSg+wQkBO8VfWvzEQwg5TWt/j1fmgW0oaSNoP4dTek0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BgnUYLXrlUopxrhlOXPTfYVdR2XLpOFXvodlSGKdefP+ZsPJm9qNpQtoB4Ar/yaUGYI0bO7o/Dn3wymtBL0y0ViiUaIvrf3zrMw3WjAVTW5GCACx1sl5X9kxkSiDc7bP9+RtYbFfYDW9IgVeVzAymDXYhpuOqlaZ383dadOgkos= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RDesrj4N; 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="RDesrj4N" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30C361F00A3D; Thu, 20 Aug 2026 17:44:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787247894; bh=CRCFqeixPxZKWMkftHakB//gOiwxDVGhpiNVto1R75c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RDesrj4NP76An407KiZhuFdoo40qasRtEcJfxYa12ReMLd2FMNVRQbhFcxu2O5A7U p60USvUXEyPHMNzqt08nXg7apgYrFWjYTQFnj4tEdpDAGCHfsgqhYDqUT0eyC2S+93 W4i6OWSl61Q5h/qZxLEPcoPkxzbjbYJ3mkL3hnMA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhan Xusheng , Ulf Hansson Subject: [PATCH 6.1 039/303] mmc: omap_hsmmc: fix busy_timeout overflow in ns conversion on 32-bit Date: Thu, 20 Aug 2026 16:52:55 +0200 Message-ID: <20260820145254.356948638@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145253.200766705@linuxfoundation.org> References: <20260820145253.200766705@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhan Xusheng commit f64ea900e4bda3055ef24a2c906f8d049cf1c3bd upstream. omap_hsmmc_prepare_data() converts the command busy timeout to nanoseconds with: timeout = req->cmd->busy_timeout * NSEC_PER_MSEC; busy_timeout is an unsigned int (milliseconds) and timeout is a u64, but NSEC_PER_MSEC is 1000000L. On 32-bit builds the multiplication is performed in 32-bit arithmetic and wraps for busy_timeout values above ~4294 ms, before the result is assigned to the u64. The driver does not set mmc->max_busy_timeout, so the core does not cap the busy timeout, and commands such as erase or SANITIZE (MMC_SANITIZE_TIMEOUT_MS is 240000 ms) can pass a busy_timeout far larger than 4294 ms. The wrapped, much smaller ns value is then programmed via set_data_timeout(), so the data timeout is set too short and the operation can time out prematurely. Cast busy_timeout to u64 before the multiplication so the conversion is done in 64-bit arithmetic. Fixes: 8cc9a3e73de1 ("mmc: host: omap_hsmmc: use generic_cmd6_time to program timeout value for CMD6") Cc: stable@vger.kernel.org Signed-off-by: Zhan Xusheng Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/omap_hsmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1358,7 +1358,7 @@ omap_hsmmc_prepare_data(struct omap_hsmm if (req->data == NULL) { OMAP_HSMMC_WRITE(host->base, BLK, 0); if (req->cmd->flags & MMC_RSP_BUSY) { - timeout = req->cmd->busy_timeout * NSEC_PER_MSEC; + timeout = (u64)req->cmd->busy_timeout * NSEC_PER_MSEC; /* * Set an arbitrary 100ms data timeout for commands with