Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1634630ybv; Fri, 21 Feb 2020 00:42:26 -0800 (PST) X-Google-Smtp-Source: APXvYqwBrBJiZZxAd4n6l/8itvs9tahiQIjdUgphxgtMoHB7FoOfPhJ5glOMxAuVTAXyrS1tAiG4 X-Received: by 2002:a9d:754e:: with SMTP id b14mr11766108otl.59.1582274546723; Fri, 21 Feb 2020 00:42:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582274546; cv=none; d=google.com; s=arc-20160816; b=ujYdohjmf2BOaglTu/Rkxmc/IDGtTPHJPj8gGIgw4/cZn1i3eXbmX3baTUWchkCHt0 LKdaltU1VuUuVHa/po8MCfPmvckrdrTQwDssQwLKN5L83JIIwWJ+wegPMXbw1gV4xqAm EcR1tYnur+7udIhnWdC/I8nXq3S1V2QMjsFdV9aTWi71Qq1INxBd0HuZbh3vmzmTzvVm zNJ3M3Nb0fa6Gf416Lni/qlRyMmDahpJriB6HUN3km3Ttv8BXfOlJeAkq4arlRbxCA08 W5+2g3lCKRxnUTN00qZylJKal2UECHRLuyY3rHsM8nY0epTaNtnjAA1v2OybEa8N3u4d MqLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XgR5dhPqia7+k7hB6UWwZ+SknCDZXa8fEDaDzxQ0CGA=; b=fgtBW5lLFWSQaRTO1LzfoG5DnrI13qq49qbJuKJ65Hde6rQxsTND6hpyKlApenCoLL q5v6PbDO8vonP8DjCammEgF6zs9iosDHPTL62L1L45k91u5h2Yli2oZTtwwAUTvanTeL U0URGUtZdiBoL3b+N5T0Mb3Z461j/4siEaQpox394uUMoM7QM8H1tZ23VgbKh16sF2kn HAABqyjFVtBwCB4CDCcjsgVRTT8nzATIkLgxVGBKCQfDrk8UKWdfw1aiqbe+Wh4rW4/y Z80u0OP18/sX4fXRDACb0zpaeiRXzX/qHBMpnnTMCz7KsK//xOjkyswxLHFVWuN8W1lc N3pA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eMQK2vRv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f17si1050167otq.96.2020.02.21.00.42.15; Fri, 21 Feb 2020 00:42:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eMQK2vRv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731088AbgBUIlg (ORCPT + 99 others); Fri, 21 Feb 2020 03:41:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:56420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730389AbgBUH44 (ORCPT ); Fri, 21 Feb 2020 02:56:56 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0696720578; Fri, 21 Feb 2020 07:56:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271816; bh=nVj7nRN/y57cRavWIX1nbC+647lSGkrubQeT0m+Ut4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eMQK2vRvkuY5E/n6h25SYFNIV8qeEynnZwA/jFEw5maTslAl/o0vgOMzskm3p91ZN F4kCbLpM9qYyATKQoi+M2cJeksjuCHExUigMmCHTH3hfTzN7PVlCuz6ir5Kx3g4sJC it85Do3welgxc7AW5i0kmnXVZHFwK0ndTbNaP1uU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Josef Bacik , David Sterba , Sasha Levin Subject: [PATCH 5.5 308/399] btrfs: safely advance counter when looking up bio csums Date: Fri, 21 Feb 2020 08:40:33 +0100 Message-Id: <20200221072431.530297023@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072402.315346745@linuxfoundation.org> References: <20200221072402.315346745@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Sterba [ Upstream commit 4babad10198fa73fe73239d02c2e99e3333f5f5c ] Dan's smatch tool reports fs/btrfs/file-item.c:295 btrfs_lookup_bio_sums() warn: should this be 'count == -1' which points to the while (count--) loop. With count == 0 the check itself could decrement it to -1. There's a WARN_ON a few lines below that has never been seen in practice though. It turns out that the value of page_bytes_left matches the count (by sectorsize multiples). The loop never reaches the state where count would go to -1, because page_bytes_left == 0 is found first and this breaks out. For clarity, use only plain check on count (and only for positive value), decrement safely inside the loop. Any other discrepancy after the whole bio list processing should be reported by the exising WARN_ON_ONCE as well. Reported-by: Dan Carpenter Reviewed-by: Josef Bacik Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/file-item.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index b1bfdc5c1387a..6f18333e83c33 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c @@ -274,7 +274,8 @@ found: csum += count * csum_size; nblocks -= count; next: - while (count--) { + while (count > 0) { + count--; disk_bytenr += fs_info->sectorsize; offset += fs_info->sectorsize; page_bytes_left -= fs_info->sectorsize; -- 2.20.1