From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54B94C282CC for ; Mon, 4 Feb 2019 16:54:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27242214DA for ; Mon, 4 Feb 2019 16:54:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549299280; bh=6/b7IjwSNZnH/Fo2h9vl/RHFosYlYbuYLDbpmmaF9Y0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IPk7CM/dmbmiR5IGcbhpYXshCXedXXDZHeNV+bjtGBMZxrI36ktoMlRUxe4QqZfGS 1UShoayvg0JAKzkOpbK2Lr2KYJmYuJlTFSuT/8j2gkkE92Gw+gXf6Ov6p/ZtC3E4An Jfi32Z7ZmuNZXyBs2HSxGXP0AzG1zu+UvBBfORN0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729892AbfBDQyj (ORCPT ); Mon, 4 Feb 2019 11:54:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:37896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729810AbfBDQyi (ORCPT ); Mon, 4 Feb 2019 11:54:38 -0500 Received: from garbanzo.lan (c-73-71-40-85.hsd1.ca.comcast.net [73.71.40.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C5CB3217D9; Mon, 4 Feb 2019 16:54:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549299278; bh=6/b7IjwSNZnH/Fo2h9vl/RHFosYlYbuYLDbpmmaF9Y0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d1NZDssYA5az7e3JEr+4dSwMu8DI8Jq+KF5NwMJ6aaVdMHQc4EDy+vYSs64o8RNWP cDGVGiIYQslBX2IgHs+O1rnCmALNRj8Ad2ruvSG63eSJU+3sZG38Cwbi/RFlRJNiaR moh28x5hNQHL4ax0QGazhHqoIjvogiRzsc3sI+Ts= From: Luis Chamberlain To: linux-xfs@vger.kernel.org, gregkh@linuxfoundation.org, Alexander.Levin@microsoft.com Cc: stable@vger.kernel.org, amir73il@gmail.com, hch@infradead.org, Eric Sandeen , "Darrick J . Wong" , Luis Chamberlain Subject: [PATCH v2 10/10] xfs: fix inverted return from xfs_btree_sblock_verify_crc Date: Mon, 4 Feb 2019 08:54:27 -0800 Message-Id: <20190204165427.23607-11-mcgrof@kernel.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190204165427.23607-1-mcgrof@kernel.org> References: <20190204165427.23607-1-mcgrof@kernel.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eric Sandeen commit 7d048df4e9b05ba89b74d062df59498aa81f3785 upstream. xfs_btree_sblock_verify_crc is a bool so should not be returning a failaddr_t; worse, if xfs_log_check_lsn fails it returns __this_address which looks like a boolean true (i.e. success) to the caller. (interestingly xfs_btree_lblock_verify_crc doesn't have the issue) Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Luis Chamberlain --- fs/xfs/libxfs/xfs_btree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c index 34c6d7bd4d18..bbdae2b4559f 100644 --- a/fs/xfs/libxfs/xfs_btree.c +++ b/fs/xfs/libxfs/xfs_btree.c @@ -330,7 +330,7 @@ xfs_btree_sblock_verify_crc( if (xfs_sb_version_hascrc(&mp->m_sb)) { if (!xfs_log_check_lsn(mp, be64_to_cpu(block->bb_u.s.bb_lsn))) - return __this_address; + return false; return xfs_buf_verify_cksum(bp, XFS_BTREE_SBLOCK_CRC_OFF); } -- 2.18.0