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 5D8161DDC3A; Wed, 19 Feb 2025 09:25:52 +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=1739957152; cv=none; b=g2ZwpAwS6b4f1eHPjsLz+tEKsQtkV7HuRejThnZMdFUb1ftOVWPxFNYhsJd/MdKAdlpf/406hUKD7YaciA9rbVtclELDLuD0fVORXW2gUMrBx7UkED7iyo+6Pb3yEsx5bx8sSj9/iVvVHHalSlfUmLJQlrvkVDtM+oC1JS6sJxA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739957152; c=relaxed/simple; bh=PEOvbbccucG4HpeZA0e1zi9u3ND/Zt71zZQy6HK4MPE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j+p+nVG22QVJDrEQKJ0yXKb3EI1hVQN6PPPYTm7BRWiIys+nxTqzpxI/qlzXEFRKhBSUl7zW2QaQRot0ouggAPTYGau7uqLBSUNfEjPNPk7mcSSjysnwibbJCDnWWC7RxRxVUBn44eZRfH4GXZCzilL8Mnj79ZVtBEVvpX8FeM0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MNNeyLmY; 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="MNNeyLmY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6A6CC4CEE6; Wed, 19 Feb 2025 09:25:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739957152; bh=PEOvbbccucG4HpeZA0e1zi9u3ND/Zt71zZQy6HK4MPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MNNeyLmYKAjhoJAhJcKopZNKRaz+mO7PnXAXNccd0i8EtWA4S8i2slTqLi0bZPcRp FxE9SOVn6BJS2CzUqbzSe/++IRr0VsUbUVbEH2zV0LMaJHj5CedCCFwLynYYfUoEi5 QspzBpoqx2tb68c1l8vZ66BFrxbmIEyObQNmh4R8= 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 6.1 427/578] ocfs2: handle a symlink read error correctly Date: Wed, 19 Feb 2025 09:27:11 +0100 Message-ID: <20250219082709.812228495@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082652.891560343@linuxfoundation.org> References: <20250219082652.891560343@linuxfoundation.org> User-Agent: quilt/0.68 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: 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 @@ -65,7 +65,7 @@ static int ocfs2_fast_symlink_read_folio if (status < 0) { mlog_errno(status); - return status; + goto out; } fe = (struct ocfs2_dinode *) bh->b_data; @@ -76,9 +76,10 @@ static int ocfs2_fast_symlink_read_folio 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 = {