From patchwork Mon Jul 18 21:12:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tadeusz Struk X-Patchwork-Id: 12921782 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19086C43334 for ; Mon, 18 Jul 2022 21:13:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234043AbiGRVND (ORCPT ); Mon, 18 Jul 2022 17:13:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229916AbiGRVNC (ORCPT ); Mon, 18 Jul 2022 17:13:02 -0400 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AF9C326DA for ; Mon, 18 Jul 2022 14:13:01 -0700 (PDT) Received: by mail-pg1-x534.google.com with SMTP id e132so11736493pgc.5 for ; Mon, 18 Jul 2022 14:13:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QWJ5QeiPjtbCRgoRk+ubXff2AujiLVH4AasYR9bygac=; b=Qpn/lLzaRXrqLa4iJ87u24VvkPxDJWWjGTAS61y4fzRiLM7VlJW1sPXmQsFa4xacBi d2LuDEY0zwc3DsJHclZrKEiiALShRj7Ss2xF36d60f/LtfL55PA70R+4bI8JTCI3oBxy PcstFGzmzR9d+6F1CkyNASRQX5bfjj8ZY3kuC2GVI/ubigks2gNlluRcWAbgjXpGx2hv +rkUWKkZLhOvkpa5WqsEu31hvv5KWNb1o+gn0mPAhLi7jTVRSwvQzfCykZz5RxI+bTGW oFCvfrPiCdknsmg4Q6EjDKN5sEdFw08Zi/IezqiUnqKY2HCoSFdMYw4g9LOeqImo0nEf p1MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QWJ5QeiPjtbCRgoRk+ubXff2AujiLVH4AasYR9bygac=; b=L+dLqHZVMILiMypemMn5MVRqwK7HKdVae5MRIlfUEVMUj4Dci4hUPy9UNRgf14DslN ctkcuVBRkBMyDOAMLopRefaUeELwx6ThthfBePgqWmbXe4FhNLKQm83CGL0YbFiDgg+e ysdpyPbNUGUbbX8670IdPVgG/k1aKQYvIQgRTvZRKA8uHYvh0WdSUizNvuSHLPxx4cKH bbxO3rfNmBw50MLOgjpngeWwvIMrz6pSvpQGUJVgpBochXR9vbBcyJx7QZDp3fY7bqjk 9Js/NPAfRz1R2CH47rB95fA/maVQdJwIA0m81p3OXd85ojbazcGwLdEDRV0DaIKnHZdo MDDg== X-Gm-Message-State: AJIora+ZjxwXWO2Fdzp6NbdimWr8PogP4NOjOqJflHajRkOHTaJWv4uu /GWMc8VR/0N9Kk6YNqgJj0vPzg== X-Google-Smtp-Source: AGRyM1sdjI8kqsIllwaX0LhjyyYfpduS2Xt4ucZ1qr4Wz+ymQBNsu+CXjfUU7JImFul/sxFNIhBGrQ== X-Received: by 2002:a63:4d0e:0:b0:412:1877:9820 with SMTP id a14-20020a634d0e000000b0041218779820mr26345153pgb.177.1658178780601; Mon, 18 Jul 2022 14:13:00 -0700 (PDT) Received: from desktop.hsd1.or.comcast.net ([2601:1c0:4c00:ad20:feaa:14ff:fe3a:b225]) by smtp.gmail.com with ESMTPSA id c7-20020a17090a020700b001ef59378951sm11918134pjc.13.2022.07.18.14.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jul 2022 14:13:00 -0700 (PDT) From: Tadeusz Struk To: stable@vger.kernel.org Cc: linux-block@vger.kernel.org, dm-devel@redhat.com, Christoph Hellwig , syzbot+4f441e6ca0fcad141421@syzkaller.appspotmail.com, Chaitanya Kulkarni , Jens Axboe , Tadeusz Struk Subject: [PATCH 5.10 2/2] block: fix bounce_clone_bio for passthrough bios Date: Mon, 18 Jul 2022 14:12:26 -0700 Message-Id: <20220718211226.506362-2-tadeusz.struk@linaro.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220718211226.506362-1-tadeusz.struk@linaro.org> References: <20220718211226.506362-1-tadeusz.struk@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Christoph Hellwig From: Christoph Hellwig Upstream commit: b90994c6ab62 ("block: fix bounce_clone_bio for passthrough bios") This is backport to stable 5.10. It fixes an issue reported by syzbot. Link: https://syzkaller.appspot.com/bug?id=a3416231e37024a75f2b95bd95db0d8ce8132a84 Now that bio_alloc_bioset does not fall back to kmalloc for a NULL bio_set, handle that case explicitly and simplify the calling conventions. Based on an earlier patch from Chaitanya Kulkarni. Fixes: 3175199ab0ac ("block: split bio_kmalloc from bio_alloc_bioset") Reported-by: syzbot+4f441e6ca0fcad141421@syzkaller.appspotmail.com Reported-by: Chaitanya Kulkarni Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe Signed-off-by: Tadeusz Struk --- block/bounce.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/block/bounce.c b/block/bounce.c index 162a6eee8999..4da429de78a2 100644 --- a/block/bounce.c +++ b/block/bounce.c @@ -214,8 +214,7 @@ static void bounce_end_io_read_isa(struct bio *bio) __bounce_end_io_read(bio, &isa_page_pool); } -static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask, - struct bio_set *bs) +static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask) { struct bvec_iter iter; struct bio_vec bv; @@ -242,8 +241,11 @@ static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask, * asking for trouble and would force extra work on * __bio_clone_fast() anyways. */ - - bio = bio_alloc_bioset(gfp_mask, bio_segments(bio_src), bs); + if (bio_is_passthrough(bio_src)) + bio = bio_kmalloc(gfp_mask, bio_segments(bio_src)); + else + bio = bio_alloc_bioset(gfp_mask, bio_segments(bio_src), + &bounce_bio_set); if (!bio) return NULL; bio->bi_disk = bio_src->bi_disk; @@ -294,7 +296,6 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig, unsigned i = 0; bool bounce = false; int sectors = 0; - bool passthrough = bio_is_passthrough(*bio_orig); bio_for_each_segment(from, *bio_orig, iter) { if (i++ < BIO_MAX_PAGES) @@ -305,14 +306,14 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig, if (!bounce) return; - if (!passthrough && sectors < bio_sectors(*bio_orig)) { + if (!bio_is_passthrough(*bio_orig) && + sectors < bio_sectors(*bio_orig)) { bio = bio_split(*bio_orig, sectors, GFP_NOIO, &bounce_bio_split); bio_chain(bio, *bio_orig); submit_bio_noacct(*bio_orig); *bio_orig = bio; } - bio = bounce_clone_bio(*bio_orig, GFP_NOIO, passthrough ? NULL : - &bounce_bio_set); + bio = bounce_clone_bio(*bio_orig, GFP_NOIO); /* * Bvec table can't be updated by bio_for_each_segment_all(),