From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5D7AF23372D; Mon, 10 Mar 2025 18:00:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741629603; cv=none; b=lx7rMMUlCY/2vG5wjKzihOnIuVf36CfPzhhpDI+WI1a3OgnREyBUasRmgB/jRCFkLiFSJz4IpCAG0Ztxfqggi/plOul37UmHPHtm4aVVAAlS5sfYeVv1FD9rCI9v8NdlNtnm3uLDr+m0Nrg7FtaWmm9wKgMRYzvx2+TaDk4Obj0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741629603; c=relaxed/simple; bh=1PWX5uVlAytZ37cvlQZg2TCjQy2eDILMHYJctCSw7EQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kybtzoQr1/9bCJ3l2nkz3d2SMritzaNpsFaR5pZK2h/dxHEP3j+E20194+e4dy3XNsiLTJOCBPSALPxGyDrzOF0pUwHatQS3/SS/+WlpOKY3iSClEyntGEc6gYt3vr2v2eIQZaN6JVNUeWfmPW8JtKmuE4JomFnY7WiwJpozq1s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=w5kKc7KJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="w5kKc7KJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7E51C4CEE5; Mon, 10 Mar 2025 18:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741629603; bh=1PWX5uVlAytZ37cvlQZg2TCjQy2eDILMHYJctCSw7EQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w5kKc7KJKaYA7mvdsKVJBqaXJJ0SG2z1+W3o33H94PuRvAqBAa50PDN1vCRfw3Kjk GozmCoQZk7vIqXykpqnZH+eGISHR8tlW9DId/NNAvrZKCO3ud8Fezioz9rYABraZMs QPxHETHTZ2nA+AaT1Ocmoiqz5gdtZK8b88VhPw4M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Matthew Wilcox (Oracle)" , Joseph Qi , Mark Fasheh , Joel Becker , Junxiao Bi , Changwei Ge , Jun Piao , Mark Tinguely , Andrew Morton Subject: [PATCH 5.15 320/620] ocfs2: handle a symlink read error correctly Date: Mon, 10 Mar 2025 18:02:46 +0100 Message-ID: <20250310170558.242036839@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170545.553361750@linuxfoundation.org> References: <20250310170545.553361750@linuxfoundation.org> User-Agent: quilt/0.68 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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matthew Wilcox (Oracle) commit 2b4c2094da6d84e69b843dd3317902e977bf64bd upstream. Patch series "Convert ocfs2 to use folios". Mark did a conversion of ocfs2 to use folios and sent it to me as a giant patch for review ;-) So I've redone it as individual patches, and credited Mark for the patches where his code is substantially the same. It's not a bad way to do it; his patch had some bugs and my patches had some bugs. Hopefully all our bugs were different from each other. And hopefully Mark likes all the changes I made to his code! This patch (of 23): If we can't read the buffer, be sure to unlock the page before returning. Link: https://lkml.kernel.org/r/20241205171653.3179945-1-willy@infradead.org Link: https://lkml.kernel.org/r/20241205171653.3179945-2-willy@infradead.org Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Jun Piao Cc: Mark Tinguely Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- fs/ocfs2/symlink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/fs/ocfs2/symlink.c +++ b/fs/ocfs2/symlink.c @@ -64,7 +64,7 @@ static int ocfs2_fast_symlink_readpage(s if (status < 0) { mlog_errno(status); - return status; + goto out; } fe = (struct ocfs2_dinode *) bh->b_data; @@ -75,9 +75,10 @@ static int ocfs2_fast_symlink_readpage(s memcpy(kaddr, link, len + 1); kunmap_atomic(kaddr); SetPageUptodate(page); +out: unlock_page(page); brelse(bh); - return 0; + return status; } const struct address_space_operations ocfs2_fast_symlink_aops = {