From patchwork Tue Oct 17 03:20:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hou Tao X-Patchwork-Id: 10010615 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EC9C460235 for ; Tue, 17 Oct 2017 03:15:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D859628689 for ; Tue, 17 Oct 2017 03:15:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC3E4286CD; Tue, 17 Oct 2017 03:15:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38B8628689 for ; Tue, 17 Oct 2017 03:15:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932379AbdJQDPi (ORCPT ); Mon, 16 Oct 2017 23:15:38 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:8496 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932141AbdJQDPi (ORCPT ); Mon, 16 Oct 2017 23:15:38 -0400 Received: from 172.30.72.59 (EHLO DGGEMS407-HUB.china.huawei.com) ([172.30.72.59]) by dggrg05-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id DJG80867; Tue, 17 Oct 2017 11:15:36 +0800 (CST) Received: from huawei.com (10.175.124.28) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.301.0; Tue, 17 Oct 2017 11:14:25 +0800 From: Hou Tao To: Subject: [PATCH] log-writes: fix possible infinite loop in zero_range() Date: Tue, 17 Oct 2017 11:20:45 +0800 Message-ID: <1508210445-27135-1-git-send-email-houtao1@huawei.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 X-Originating-IP: [10.175.124.28] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090204.59E575D8.009C, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 0814087e4e376ad2f31b81327ad59b41 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Found it when trying to remove the limitation of log->max_zero_size. Signed-off-by: Hou Tao Reviewed-by: Amir Goldstein --- src/log-writes/log-writes.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/log-writes/log-writes.c b/src/log-writes/log-writes.c index fab447a..0939157 100644 --- a/src/log-writes/log-writes.c +++ b/src/log-writes/log-writes.c @@ -65,6 +65,9 @@ static int zero_range(struct log *log, u64 start, u64 len) memset(buf, 0, bufsize); while (len) { + if (len < bufsize) + bufsize = len; + ret = pwrite(log->replayfd, buf, bufsize, start); if (ret != bufsize) { fprintf(stderr, "Error zeroing file: %d\n", errno);