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=1795044485; b=yqQ9sCBluq1iL/BAdzusigixiy95Z5+7QzG5rvf6R5qk3/wdgf8aM8/m+6+oAqRO7bLY qAFXZivu0ZVpVrkYhKJxHHP0kkcKussNZ49L7qeOcJntK1/K5banCumEZe0fhRiDqNExt GC/LMfgOh+vvSzpZ1pr4Ey15gYS+WnOiR3XMOfJoSMe7eT3lV2sb1jsSEWNg5JuVQcb0j HrQdxmvtSA81BCPzB9cEijKo5y71M1fOVweot8jOpBxv7KeXI+by+yQL0vtoo6k7v2jIE 63ysec+eped7HtdZmNvwKfvcCUJMcQOPaRY+4Qft7bwQIi0GbyYwAyLY5k9zlRnzNLw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795044485; 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=h1+1yi41pBu3snOVnoztPnf88U3h77P1g0th/Rh2j5A=; b=FfLhwMlFEhwc3OljIymlHpFADddpzeInu8v2FdkMc/hRsVQiGKUxephhhlKg7IHsfL6m 4pMuncx/WMMa5IcMgj3qk1Q/gtVISIOb2rbDBma+Omd2fCBg1Ytvu5aBlACaaEJzBE1mh NcXelFyROSS79FHjU3GU5yntsdOUMpYY5A2YkZ6tSXQKP1wsGATenmeiQ6g0MkHI7ZwPr YHXRMgjxDweSBLx7MzlNjbd4jgoXuFMudDVAyPwFj0Qg4VO7+4E71peEQA5cz2qJFcSmQ ieunvNGPFzaeSM0Zd46EQl19cpFGdh3NQfm8OpEjM9lFf2bFGdeFDPywD1Sx+pVpO6g== 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=tjmTRjzA; 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 183C5606A31C; Wed, 18 Nov 2026 23:28:05 +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=tjmTRjzA Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AB371F000C4; Wed, 18 Nov 2026 23:28:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795044485; bh=h1+1yi41pBu3snOVnoztPnf88U3h77P1g0th/Rh2j5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tjmTRjzAMHXTCYOTyyvFCAv6zF5xGJmnkrzq+FSD8FUTvel1MnFS5DV9DYKuKYHRx VGHrXyc5v3CDjbTR5Moq/xlHW1buXmCBXgCtVkRzVPfYn2EulVBtR4/syad2S6jhIL 4U+OH06paFkwdWwzv2kVRn3DX2PAFXbgI5kjBiDo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Al Viro , Joseph Qi , Sasha Levin Subject: [PATCH 6.1 0585/2857] ufs: fix ufs_read_cylinder() failure handling Date: Wed, 18 Nov 2026 15:26:59 +0100 Message-ID: <20261118150222.546881006@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Al Viro commit 0bfd3e1078c537cd66a8addb1c01835de4234a4c upstream. 1) ufs_load_cylinder() should return NULL on ufs_read_cylinder() failures. ufs_error() is not enough. As it is, IO failure on attempt to read a part of cylinder group metadata is likely to end up with an oops. 2) we drop the wrong buffer heads when undoing sb_bread() on IO failure halfway through the read - we need to brelse() what we've got from sb_bread(), TYVM... Signed-off-by: Al Viro Signed-off-by: Joseph Qi Signed-off-by: Sasha Levin --- fs/ufs/cylinder.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/fs/ufs/cylinder.c b/fs/ufs/cylinder.c index 5781c7db97276..b930ee1cf8530 100644 --- a/fs/ufs/cylinder.c +++ b/fs/ufs/cylinder.c @@ -26,7 +26,7 @@ * Read cylinder group into cache. The memory space for ufs_cg_private_info * structure is already allocated during ufs_read_super. */ -static void ufs_read_cylinder (struct super_block * sb, +static bool ufs_read_cylinder(struct super_block *sb, unsigned cgno, unsigned bitmap_nr) { struct ufs_sb_info * sbi = UFS_SB(sb); @@ -46,9 +46,11 @@ static void ufs_read_cylinder (struct super_block * sb, * We have already the first fragment of cylinder group block in buffer */ UCPI_UBH(ucpi)->bh[0] = sbi->s_ucg[cgno]; - for (i = 1; i < UCPI_UBH(ucpi)->count; i++) - if (!(UCPI_UBH(ucpi)->bh[i] = sb_bread(sb, UCPI_UBH(ucpi)->fragment + i))) + for (i = 1; i < UCPI_UBH(ucpi)->count; i++) { + UCPI_UBH(ucpi)->bh[i] = sb_bread(sb, UCPI_UBH(ucpi)->fragment + i); + if (!UCPI_UBH(ucpi)->bh[i]) goto failed; + } sbi->s_cgno[bitmap_nr] = cgno; ucpi->c_cgx = fs32_to_cpu(sb, ucg->cg_cgx); @@ -77,13 +79,14 @@ static void ufs_read_cylinder (struct super_block * sb, goto failed; } UFSD("EXIT\n"); - return; + return true; failed: for (j = 1; j < i; j++) - brelse (sbi->s_ucg[j]); + brelse(UCPI_UBH(ucpi)->bh[j]); sbi->s_cgno[bitmap_nr] = UFS_CGNO_EMPTY; ufs_error (sb, "ufs_read_cylinder", "can't read cylinder group block %u", cgno); + return false; } /* @@ -166,15 +169,14 @@ struct ufs_cg_private_info * ufs_load_cylinder ( UFSD("EXIT (FAILED)\n"); return NULL; } - else { - UFSD("EXIT\n"); - return sbi->s_ucpi[cgno]; - } } else { - ufs_read_cylinder (sb, cgno, cgno); - UFSD("EXIT\n"); - return sbi->s_ucpi[cgno]; + if (unlikely(!ufs_read_cylinder (sb, cgno, cgno))) { + UFSD("EXIT (FAILED)\n"); + return NULL; + } } + UFSD("EXIT\n"); + return sbi->s_ucpi[cgno]; } /* * Cylinder group number cg is in cache but it was not last used, @@ -205,7 +207,10 @@ struct ufs_cg_private_info * ufs_load_cylinder ( sbi->s_ucpi[j] = sbi->s_ucpi[j-1]; } sbi->s_ucpi[0] = ucpi; - ufs_read_cylinder (sb, cgno, 0); + if (unlikely(!ufs_read_cylinder (sb, cgno, 0))) { + UFSD("EXIT (FAILED)\n"); + return NULL; + } } UFSD("EXIT\n"); return sbi->s_ucpi[0]; -- 2.53.0