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=1795029948; b=TujGpqNYfcfoCjkH+9hYlX+QzhZoxLbUdJxxGaQQZWMZeQlYd4eephYBCJErkvPNHGb4 k7eNMEb3O3+4CYUtwHalFBG0ioQZsBf28pX3FAaS6HUDvKW5cKAigGFVu+fa99C0JGM3D J+jRwrERLaRA5AkVRyxWU3BvMvPCNyvz1GVyD/8V/JPoNEmKygzlLz6b9vWZ1oJRi/Gqd eTaYDWLCZW/QrCdlS3pBe5Ugr/TsKoL3yjQ/kK3W6lOgsCykGnUfNedEouNWdFeayeIgb 18Uj4fHkRt4oK++L4iTFttj2Zo40GVRtVkc3KK8ZdJZxIezPgZQV0IDCMy0EOcktcaw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795029948; 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=0X5iEWRBeSM30Q/WJXndpCD0npme4wl/KkzZo/yjTCY=; b=wexxCMktSdjMvWvYHFkvjEreo1axAVRdYC0GzzwNn1gAj7tE+wd/rmALmcHK4qFUjC0v TabpCiafAKRCT00xLOZ0Pe/+wMhy8N78dMddntLEn9NxSGqIU0qRvSTxJFM8b2FJQgfRL CKXg6iqdtK2KylOKEi3gVn36budD9kXvp3+HZbbndNLJAdShWWoNr3xsm51nNDhkT5bCz dgNv8Z3QknhbjxOxnhIIeaRq7S99WwGg6UTucuoldXHKv7xS6G/PiADXFiSc72H6OkykU mYggN4+6m04UIvE7kiwUAMhzGHso2xbFUNjrirY3A2SMV5TecrFbM4e3KKFLYqvmvFg== 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=HsOj1Xyl; 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 42C7C60A263A; Wed, 18 Nov 2026 19:25:48 +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=HsOj1Xyl Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9AF781F000C4; Wed, 18 Nov 2026 19:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795029948; bh=0X5iEWRBeSM30Q/WJXndpCD0npme4wl/KkzZo/yjTCY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HsOj1XylU/hPpu+v4J6pIJ6zRc9RLcENMWisB9UcTa80bGUH3y7Od41mxiFV2nAgJ XqD8THvL4qUbAEdMIK6cGDeIm13NS2D9L1b7sqKQiJuFSRGosPi2ZHvwzbwWt3nbLL gmA/IFDOOibdFNcT3qXFX5GK3DGw1t5x+PjWSQM0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Laurent Vivier , Finn Thain , Stan Johnson , Jens Axboe , Sasha Levin Subject: [PATCH 6.12 0531/1756] swim: Check error register during sector read Date: Wed, 18 Nov 2026 15:44:18 +0100 Message-ID: <20261118150030.246581713@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Finn Thain [ Upstream commit d66bdef0a3083fed1a0fc4f0ee1c85b26476b21c ] Clear the error register only once before a sector read operation. Don't clear it afterwards -- the caller needs it. Check the error register in swim_read_sector() and return the appropriate error when necessary. Fully validate the sector header. Don't terminate the search loop early just because an erroneous sector header showed up. Fixes: 8852ecd97488 ("m68k: mac - Add SWIM floppy support") Reviewed-by: Laurent Vivier Signed-off-by: Finn Thain Tested-by: Stan Johnson Link: https://patch.msgid.link/efabd807f4ecf5cbc05b60e91ed69aa4c10691a8.1788513997.git.fthain@linux-m68k.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/swim.c | 13 +++++++------ drivers/block/swim_asm.S | 8 -------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/block/swim.c b/drivers/block/swim.c index 57f37bb3ece8c..9a8362a90f036 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -483,20 +483,21 @@ static inline int swim_read_sector(struct floppy_state *fs, local_irq_save(flags); for (i = 0; i < 36; i++) { - ret = swim_read_sector_header(base, &header); - if (!ret && (header.sector == sector)) { + if (swim_read_sector_header(base, &header) || + swim_read(base, error) || header.track != track || + header.side != side || header.size != 2) + continue; + if (header.sector == sector) { /* found */ ret = swim_read_sector_data(base, buffer); + if (swim_read(base, error)) + ret = -EIO; break; } } local_irq_restore(flags); - if ((header.side != side) || (header.track != track) || - (header.sector != sector)) - return 0; - return ret; } diff --git a/drivers/block/swim_asm.S b/drivers/block/swim_asm.S index 81c824923336c..fcf574ced85ec 100644 --- a/drivers/block/swim_asm.S +++ b/drivers/block/swim_asm.S @@ -67,7 +67,6 @@ mfm_read_addrmark: movew #seek_time, %d2 wait_header_init: - tstb %a3@(read_error - read_mark) moveb #0x18, %a3@(write_mode0 - read_mark) moveb #0x01, %a3@(write_mode1 - read_mark) moveb #0x01, %a3@(write_mode0 - read_mark) @@ -140,8 +139,6 @@ crc1: tstb %a2@ andb #.Lhr_crc_error, %d5 bne signal_nonyb - tstb %a3@(read_error - read_mark) - moveq #0, %d0 signal_nonyb: moveb #0x18, %a3@(write_mode0 - read_mark) @@ -166,7 +163,6 @@ mfm_read_data: movew #seek_time, %d2 wait_data_init: - tstb %a3@(read_error - read_mark) moveb #0x18, %a3@(write_mode0 - read_mark) moveb #0x01, %a3@(write_mode1 - read_mark) moveb #0x01, %a3@(write_mode0 - read_mark) @@ -191,8 +187,6 @@ wait_data_mark_byte: /* read data */ - tstb %a3@(read_error - read_mark) - movel #sector_size-1, %d4 /* sector size */ read_new_data: movew #max_retry, %d2 @@ -234,8 +228,6 @@ data_crc1: andb #.Lhr_crc_error, %d5 bne data_exit - tstb %a3@(read_error - read_mark) - /* return number of bytes read */ movel #sector_size, %d0 -- 2.53.0