Received: by 2002:ac0:e34a:0:0:0:0:0 with SMTP id g10csp483913imn; Wed, 27 Jul 2022 11:28:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sKA7M7zgSc9NrTOnzJqkM9QUt9XOOwaWnQy36jHyrNkq05Khw5yBUvQsx2UvmBT5/lYN5h X-Received: by 2002:a17:906:9bd2:b0:72b:3c47:6ff5 with SMTP id de18-20020a1709069bd200b0072b3c476ff5mr18523406ejc.757.1658946527695; Wed, 27 Jul 2022 11:28:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658946527; cv=none; d=google.com; s=arc-20160816; b=z0mMVMRRUQ1QXTbS0TlEy9O30TrluyVymwlY7Heb6ke5gGDU0ALKZ4lGTs2JlDfCVm C6M+/c/ybShbF+agxFCMrz7n/K3zPv/meDv83dvF9EgL45I9vwXdGzjDdg2rEDlDDW5+ 0B4wihrg6DcU6kBYU06EcTx45XFu0Ag8CVtP0MAhTiqrap+Tl6CPAIoxAQDV/SZ/F8ro MsiDO6P3vlJB5UQCJgNup4U7VUtaREvGYkjNZwPGFU0SOBE+Wg998JiNTwo15tE84ewv TPuOhy4T2uXrIntCU09xXzUjYDR6iJiqUvPMpU/l0q+a8HO0CdC2pdyv7abQwPdaAXcy DEBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BUnVvofaysEwJQFn0f9L7ajJRIjEdGCK83km30oJlVs=; b=P/UFBFceojrwE6kKYhmUG+tAcHBGwBF8qlMPHk2aKIhe6sAIOPnKSjlUrnB6ujDKPe s+tkMjzcAG+C1pwRLOldxGEyTvod1A8hbh8fRrkWz8qFgZfdrPBFwioufHfLRuS71OMm PyxJLfmyX7wbPrAS4or51ttP5tZDgmgQO7iZuQo1ucTW98oZqrTDe2WCz2DfmwMunxeM erHmzQRPHvYygnMTUBfINKo+qrmVdy8QEDCjlGdmNBA1KVK6qgW+78sLTa0UemPi0wjt K3wP99P/yFIM5RLl7ULqhaHh8p9xnb8Xw2L7VfSek8iT5tdcLWTcbAQuQEFO92uNT7qQ ZllQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ip0nrFGv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b11-20020a0564021f0b00b0043bca6b19e3si15211802edb.609.2022.07.27.11.28.22; Wed, 27 Jul 2022 11:28:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ip0nrFGv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236580AbiG0RAA (ORCPT + 99 others); Wed, 27 Jul 2022 13:00:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230173AbiG0Q6v (ORCPT ); Wed, 27 Jul 2022 12:58:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D60C6759F; Wed, 27 Jul 2022 09:37:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 06B11B821A6; Wed, 27 Jul 2022 16:36:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 494D2C433D6; Wed, 27 Jul 2022 16:36:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658939785; bh=TRUEB7p4AbyqXNIiq6XMX+D4eko7r6zTCXx7Ibqm4S4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ip0nrFGvVOJjmq0MHmqJx8FmkV9ZrdvzconIDUXKST4UjOyP6HD6xfzlkxOuNlh6h Vgey0YKOMb44wVN7US4JiiGiQJVaJfe4ewTTEN+4ZUvh+YWI9aMa//LOuCmX527mM+ wA5iNEcOTw+uCfia3F90R4uJtztbZzbpx1z/DLNM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Thumshirn , Chaitanya Kulkarni , Damien Le Moal , Christoph Hellwig , Ming Lei , Jens Axboe Subject: [PATCH 5.10 104/105] block: fix memory leak of bvec Date: Wed, 27 Jul 2022 18:11:30 +0200 Message-Id: <20220727161016.275605431@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220727161012.056867467@linuxfoundation.org> References: <20220727161012.056867467@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ming Lei commit 8358c28a5d44bf0223a55a2334086c3707bb4185 upstream. bio_init() clears bio instance, so the bvec index has to be set after bio_init(), otherwise bio->bi_io_vec may be leaked. Fixes: 3175199ab0ac ("block: split bio_kmalloc from bio_alloc_bioset") Cc: Johannes Thumshirn Cc: Chaitanya Kulkarni Cc: Damien Le Moal Reviewed-by: Christoph Hellwig Signed-off-by: Ming Lei Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- block/bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/block/bio.c +++ b/block/bio.c @@ -491,8 +491,8 @@ struct bio *bio_alloc_bioset(gfp_t gfp_m if (unlikely(!bvl)) goto err_free; - bio->bi_flags |= idx << BVEC_POOL_OFFSET; bio_init(bio, bvl, bvec_nr_vecs(idx)); + bio->bi_flags |= idx << BVEC_POOL_OFFSET; } else if (nr_iovecs) { bio_init(bio, bio->bi_inline_vecs, BIO_INLINE_VECS); } else {