From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4AA62C4338F for ; Fri, 6 Aug 2021 04:13:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1076560EBC for ; Fri, 6 Aug 2021 04:13:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230492AbhHFENf (ORCPT ); Fri, 6 Aug 2021 00:13:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29147 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229836AbhHFENd (ORCPT ); Fri, 6 Aug 2021 00:13:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628223198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=2cLWI/t0aU4J/1svlUXqvNKykGWstngh/6AvnsI+K2w=; b=bFJX+N/YRD4U660fxVfFykBpZ/yXq2fuv/qt1BX+Hqv0/xZ/Vu7BBBuPR6ANwcuellBnEz kaJm4Epi8nAGHWLuKigWrCbujN2J+M9yeaeStpjXiJpCf4YMrjylwvKGPrgskg5QjoswFc Q95cdGdY9rhk31tbfzGd5PjjScqFK1s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-187-Ck-Ob70APVScd7I7VHWyPw-1; Fri, 06 Aug 2021 00:13:14 -0400 X-MC-Unique: Ck-Ob70APVScd7I7VHWyPw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14B751006C80; Fri, 6 Aug 2021 04:13:13 +0000 (UTC) Received: from T590 (ovpn-12-45.pek2.redhat.com [10.72.12.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 07B3960CA1; Fri, 6 Aug 2021 04:13:00 +0000 (UTC) Date: Fri, 6 Aug 2021 12:12:55 +0800 From: Ming Lei To: "yukuai (C)" Cc: Jens Axboe , linux-block@vger.kernel.org, Bart Van Assche , Hannes Reinecke , John Garry , Christoph Hellwig , David Jeffery , Shinichiro Kawasaki Subject: Re: [PATCH V7 0/4] blk-mq: fix request UAF related with iterating over tagset requests Message-ID: References: <20210511152236.763464-1-ming.lei@redhat.com> <678fd2c5-587d-6abe-4348-067210d4adae@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <678fd2c5-587d-6abe-4348-067210d4adae@huawei.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Fri, Aug 06, 2021 at 11:40:25AM +0800, yukuai (C) wrote: > On 2021/05/11 23:22, Ming Lei wrote: > > Hi Jens, > > > > This patchset fixes the request UAF issue by one simple approach, > > without clearing ->rqs[] in fast path, please consider it for 5.13. > > > > 1) grab request's ref before calling ->fn in blk_mq_tagset_busy_iter, > > and release it after calling ->fn, so ->fn won't be called for one > > request if its queue is frozen, done in 2st patch > > > > 2) clearing any stale request referred in ->rqs[] before freeing the > > request pool, one per-tags spinlock is added for protecting > > grabbing request ref vs. clearing ->rqs[tag], so UAF by refcount_inc_not_zero > > in bt_tags_iter() is avoided, done in 3rd patch. > > > > V7: > > - fix one null-ptr-deref during updating nr_hw_queues, because > > blk_mq_clear_flush_rq_mapping() may touch non-mapped hw queue's > > tags, only patch 4/4 is modified, reported and verified by > > Shinichiro Kawasaki > > - run blktests and not see regression > > > > V6: > > - hold spin lock when reading rq via ->rq[tag_bit], the issue is > > added in V5 > > - make blk_mq_find_and_get_req() more clean, as suggested by Bart > > - not hold tags->lock when clearing ->rqs[] for avoiding to disable > > interrupt a bit long, as suggested by Bart > > - code style change, as suggested by Christoph > > > > V5: > > - cover bt_iter() by same approach taken in bt_tags_iter(), and pass > > John's invasive test > > - add tested-by/reviewed-by tag > > > > V4: > > - remove hctx->fq-flush_rq from tags->rqs[] before freeing hw queue, > > patch 4/4 is added, which is based on David's patch. > > > > V3: > > - drop patches for completing requests started in iterator ->fn, > > because blk-mq guarantees that valid request is passed to ->fn, > > and it is driver's responsibility for avoiding double completion. > > And drivers works well for not completing rq twice. > > - add one patch for avoiding double accounting of flush rq > > > > V2: > > - take Bart's suggestion to not add blk-mq helper for completing > > requests when it is being iterated > > - don't grab rq->ref if the iterator is over static rqs because > > the use case do require to iterate over all requests no matter if > > the request is initialized or not > > > > > > Ming Lei (4): > > block: avoid double io accounting for flush request > > blk-mq: grab rq->refcount before calling ->fn in > > blk_mq_tagset_busy_iter > > blk-mq: clear stale request in tags->rq[] before freeing one request > > pool > > blk-mq: clearing flush request reference in tags->rqs[] > > > > block/blk-flush.c | 3 +- > > block/blk-mq-tag.c | 49 ++++++++++++++++++------ > > block/blk-mq-tag.h | 6 +++ > > block/blk-mq.c | 95 ++++++++++++++++++++++++++++++++++++++++------ > > block/blk-mq.h | 1 + > > 5 files changed, 130 insertions(+), 24 deletions(-) > > > > Hi, ming > > I see this patchset was applied to fix the problem while iterating over > tagset, however blk_mq_tag_to_rq() is still untouched, and this > interface might still return freed request. > > Any reason why this interface didn't use the same solution ? > (hold tags->lock and return null if ref is 0) It is driver's responsibility to cover race between normal completion and timeout/error handing, so driver has the knowledge if one tag is valid or not. In short, it is driver's responsibility to guarantee that valid 'tag' is passed to blk_mq_tag_to_rq(). Thanks, Ming