From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795016966; b=IXgg6yFzl6EpoI0/vTIWvLm4hcqiCo8EZ8SC6GOkoEOocFYEFDfVlnUGczW+O/5Dy5YH 1DB2Rgaful8TRr0+1pAMXJiPm0C+nkc6yNAkgEdad45qYw9/Z6OgEaWRLKaYOem56pvJA D6PKDjtPUFa5XbS8FZgE0Ix3FgAI7OF7qmnch0rnPuM/VKXRQMu7e29OB54AXfKHlOXMI QSStnAhRXt7cegzBUD7X0FvIiyOfht2hA25sgO8JLIiyjn8uA2uKIxLsJY7Q/WRE6Xe6z HEaMVR02Zmx3fRy80Vmx5zoI4luQ1PHKD2uN5iq0ulp6l8UVnttn0oG7xr9lwnWtogg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795016966; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=alUNtuFFVwpkz6dtYNFvpiH5/3ntDlFPLXdHl2JPSGg=; b=MtdNOWFaW+w7awp70rE1k/aQUtLN7EjaPDYdWLfJ/PngytT+IWAyZkOH7PY6updNipsD tmYQhwjkhSF2gxFoZSlYkDgE5adGCZGM95Dd5MQ0512HZhqmyWEkls9cJzKnEfTD6gvIc br4a5oAFmpEPfj7o2vxejVWEnE5Tc2el7DXxtDMQQbIult+0kkGy54CUnrB8zD5w4x7KS kGW/Xodp9HxG2tXWF6Otu2nwiMCXwXuMcTvxMSkfeMAf16QvMiPvI1bHbarYG5dbHRV3m QvhcOd4paaeZSap+89aE2UDUZFTyxzJPmp3dXGP6bJjZhWaCwKkpd0mBFwqyJiHxpxw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="ZA7w/7za"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29319606A32A; Wed, 18 Nov 2026 15:49:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=ZA7w/7za Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7AA981F000C5; Wed, 18 Nov 2026 15:49:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795016966; bh=alUNtuFFVwpkz6dtYNFvpiH5/3ntDlFPLXdHl2JPSGg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZA7w/7zaJTNhjvmeE67o+WrO2ZkRGJZhZhS3bxN/g2Ip5hnzXUXkmpfxFYZQSOInG KfJdC8yVO6+qir6u4ffDH4jomT5C72CGpvhwzdiRmPUyRu4la+jcgjNAExgp2pT5c5 uLcIhcJIcOEndU6LSwrLvFSLCS3EfwhllG0JtCCU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Finn Thain , Stan Johnson , Jens Axboe , Sasha Levin Subject: [PATCH 7.3 0716/2651] swim: Fix buffer overflow Date: Wed, 18 Nov 2026 15:32:36 +0100 Message-ID: <20261118150313.655866126@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150247.972732815@linuxfoundation.org> References: <20261118150247.972732815@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Finn Thain [ Upstream commit a54870a4ae4962acf341eb6ca010cae02af1a6ea ] The effect of this bug can be observed as swim_read_sector_data() inexplicably returning -5, or an error flag indicating that a mark byte was read from the data register, or other odd behviour. When copying bytes from the chip FIFO to the read buffer, the driver keeps count of the remaining buffer space using register %d4. A counter in register %d2 serves as a timeout. The driver polls (%a2), the handshake register, until flags indicate that byte(s) have arrived in the FIFO. movel #sector_size-1, %d4 read_new_data: movew #max_retry, %d2 read_data_loop: moveb %a2@, %d5 andb #0xc0, %d5 dbne %d2, read_data_loop beq data_exit moveb %a5@, %a4@+ andb #0x40, %d5 dbne %d4, read_new_data beq exit_loop Note that the exit_loop branch depends upon a flag in the handshake register and not on the remaining buffer space. Hence there may be no branch to exit_loop after %d4 is decremented to -1 (i.e. full buffer). moveb %a5@, %a4@+ dbra %d4, read_new_data exit_loop: Here is a second decrement of %d4 which can now reach -2. But the buffer bounds check is a comparison with -1, which is now ineffective. Hence the loop will continue copying until %d2 eventually reaches -1. Fix this bug by terminating the loop as soon as %d4 or %d2 reach -1. Reset the timeout whenever a byte is copied. Fixes: 8852ecd97488 ("m68k: mac - Add SWIM floppy support") Signed-off-by: Finn Thain Tested-by: Stan Johnson Link: https://patch.msgid.link/d8fceda197b840f892d9b511175e824ca2549f01.1788513997.git.fthain@linux-m68k.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/swim_asm.S | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/block/swim_asm.S b/drivers/block/swim_asm.S index 699f7c90dd1c0..e06aadb411a14 100644 --- a/drivers/block/swim_asm.S +++ b/drivers/block/swim_asm.S @@ -43,6 +43,8 @@ .equ sector_size, 512 .equ .Lhr_crc_error, 0x02 + .equ .Lhr_fifo_2bytes, 0x40 + .equ .Lhr_fifo_1byte, 0x80 .global swim_read_sector_header swim_read_sector_header: @@ -189,20 +191,20 @@ wait_data_mark_byte: /* read data */ movel #sector_size-1, %d4 /* sector size */ -read_new_data: movew #max_retry, %d2 read_data_loop: moveb %a2@, %d5 - andb #0xc0, %d5 + andb #(.Lhr_fifo_1byte + .Lhr_fifo_2bytes), %d5 dbne %d2, read_data_loop beq data_exit + moveq #max_retry, %d2 moveb %a5@, %a4@+ - andb #0x40, %d5 - dbne %d4, read_new_data - beq exit_loop + dbra %d4, 1f + bra data_crc0 +1: andb #.Lhr_fifo_2bytes, %d5 + beq read_data_loop moveb %a5@, %a4@+ - dbra %d4, read_new_data -exit_loop: + dbra %d4, read_data_loop /* read CRC */ -- 2.53.0