Received: by 2002:a05:6a10:6006:0:0:0:0 with SMTP id w6csp1771458pxa; Sat, 29 Aug 2020 02:41:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWf81CGbzbtIHrNvBSQJgq3ykBWDqlv33CdTLmsFtlUWW/h2UxFENgFFqKShzhTanJT+No X-Received: by 2002:a17:906:b88b:: with SMTP id hb11mr2764783ejb.59.1598694059927; Sat, 29 Aug 2020 02:40:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598694059; cv=none; d=google.com; s=arc-20160816; b=iI61CtdxfBhV45FY9FMlsCtDPFUL0wSoDNZ/IQzY2iiSgT7YET8QuQvT67/BYhRm5u uhrsrxAGUV5MS59izy/pUCA/BbWUxTeayGERJEbiHeIZ7dbJXyyBlk3ZeejBFYLoyDYq dRQK1V0B98Aqo2Bs7JXlaIJOXLKLtjKcV/RCcCK1xX7xDHCSW3PMIAnBHc3eFi7kW1CD ZYSzbZbGoyiKRmRxsTxwwX6L8fVFmoQpsD9YT1CQm+YVeNQIpFNKLApHC91hXu0Uht/b o1sDK/stpxbJlBUsf4HgtfZ2V0c/NK+REozYFZBVaPAi/aezKoOyPd26hXRvsRklqz7s rzdA== 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 :message-id:date:subject:cc:to:from; bh=klig1gWwhkmxjHRlQQuW3ooHjOQ1naqrwgs/IakDYv4=; b=EoeDi7Mo9GusUlzdwQTRU67C13EAiV4GcpY4k5m1vipnggIkqpWnQqVw34EBF3MP9x oxxjdTXOPvWW435qccTN4Ut/AR9FzLXanDqizxlHzF1wHlg5uXjuHBGTfBPhqH6+/alC E8BLRCoQkf1cVIHaXo/cvKvtxRx+8LLtFOBOx7I3a6y1xc/Q3ZlfyUO5faGd4ylvck8G xbz82xv4/YHLbC3TwlGRq3TsPd29pAV4fN3SCAoQaVB+EtwW6ydQk4p7MPBUY30Tk2eb w51DZuKqn8Vv/eRumKgS3waR1g62Yviy0Mk2cXC6de817i3QxtGYomQCzD2xuY+j/jCk yWKg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v6si1546316ejc.37.2020.08.29.02.40.34; Sat, 29 Aug 2020 02:40:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727069AbgH2Jiy (ORCPT + 99 others); Sat, 29 Aug 2020 05:38:54 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:45636 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727003AbgH2Jix (ORCPT ); Sat, 29 Aug 2020 05:38:53 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 18FB52DB5BFE21E2EF9B; Sat, 29 Aug 2020 17:38:51 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.487.0; Sat, 29 Aug 2020 17:38:43 +0800 From: Miaohe Lin To: CC: , , Subject: [PATCH] block: bio: Trim bio to sensible size in bio_trim() Date: Sat, 29 Aug 2020 05:37:33 -0400 Message-ID: <20200829093733.45833-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Trim bio to sensible size in bio_trim() or something bad may happen. Signed-off-by: Miaohe Lin --- block/bio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/bio.c b/block/bio.c index a9931f23d933..94e4f97d3d4e 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1509,7 +1509,8 @@ void bio_trim(struct bio *bio, int offset, int size) return; bio_advance(bio, offset << 9); - bio->bi_iter.bi_size = size; + if (likely(bio->bi_iter.bi_size >= size)) + bio->bi_iter.bi_size = size; if (bio_integrity(bio)) bio_integrity_trim(bio); -- 2.19.1