Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1217190pxb; Thu, 16 Sep 2021 02:26:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKO6IAKT4bXi9HuqsXQ1F5HaTvqiRw/BPhMk3SRYFkUj6F3WbU3IE3rNjEKnwmLhAaPXf0 X-Received: by 2002:a17:906:4e8d:: with SMTP id v13mr5196878eju.436.1631784391607; Thu, 16 Sep 2021 02:26:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631784391; cv=none; d=google.com; s=arc-20160816; b=n1hGOwYAZ4dZt+UfghxHCiKZfw2dNbyvYGD/OD79u6G1eyHS/CDQV66vrlCX0GVGpp mH54VIhX0uj3lL00PfAPHGkbZiUP2umaANTZOrwJ4VFKF45f44oA496BBMQW/AF5ZfLL xqv4b8SfxQ1T9q3Zgu1d9iE53pRocqgrTgfqLf81NqVhBLW/sHzvW03gwjDnkuSOI2wO nQY9jzjR+V2FdBVcuKJXmxlntx+GyJElLjMRK/8BP5SK+b11ElKd+vCPsy6l0ISIdIbH CBeeVQLPrSE3GES3imPjWohjVcJO1EVfXfMLDysDJr7zvHNsWImnHBNWkwW3zwgxStLj +7NA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ZCAEtJeSvti/Z9OFXsiBgkxjIlVanOIreX58X0NCNYI=; b=Utw0swqaXvp0J7o3Yzx+PU40N2XP0dgz6tJyCTKn5OXetBDF2NIeURQu4e19pgHfwj mNZnCgMDukHZPf/fxJWYOvX5zs9siTlbH5+shpNMxMJKZpy0rseqmN+QdoUhzRNaCcyK p8qxY5R5+pOxj1+2E//2k6hqAMVqPUVB+xP7etVtRdniweIqQws7WqheX+vMp6LtGxtu q9+Sjz2AyMg+t3i/2lki6Mu8BN9qFS/t8tMZci20rBt+s4FBuYsSyHDBQQPleYeAismR sZ2DjlngaMkZX1lpUXB0ZlSJ1OUW7LpDZBvz0+ffh/GC+bR9JRLVJieIu/+vR2CVduF3 AayQ== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l24si2880370edw.288.2021.09.16.02.26.08; Thu, 16 Sep 2021 02:26:31 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236093AbhIPJZh (ORCPT + 99 others); Thu, 16 Sep 2021 05:25:37 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:15428 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235521AbhIPJZ1 (ORCPT ); Thu, 16 Sep 2021 05:25:27 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4H9BPV4YW0zRGBR; Thu, 16 Sep 2021 17:19:58 +0800 (CST) Received: from dggema762-chm.china.huawei.com (10.1.198.204) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.8; Thu, 16 Sep 2021 17:24:05 +0800 Received: from huawei.com (10.175.127.227) by dggema762-chm.china.huawei.com (10.1.198.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.8; Thu, 16 Sep 2021 17:24:05 +0800 From: Yu Kuai To: , , , CC: , , , , Subject: [patch v8 7/7] nbd: fix uaf in nbd_handle_reply() Date: Thu, 16 Sep 2021 17:33:50 +0800 Message-ID: <20210916093350.1410403-8-yukuai3@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210916093350.1410403-1-yukuai3@huawei.com> References: <20210916093350.1410403-1-yukuai3@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggema762-chm.china.huawei.com (10.1.198.204) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is a problem that nbd_handle_reply() might access freed request: 1) At first, a normal io is submitted and completed with scheduler: internel_tag = blk_mq_get_tag -> get tag from sched_tags blk_mq_rq_ctx_init sched_tags->rq[internel_tag] = sched_tag->static_rq[internel_tag] ... blk_mq_get_driver_tag __blk_mq_get_driver_tag -> get tag from tags tags->rq[tag] = sched_tag->static_rq[internel_tag] So, both tags->rq[tag] and sched_tags->rq[internel_tag] are pointing to the request: sched_tags->static_rq[internal_tag]. Even if the io is finished. 2) nbd server send a reply with random tag directly: recv_work nbd_handle_reply blk_mq_tag_to_rq(tags, tag) rq = tags->rq[tag] 3) if the sched_tags->static_rq is freed: blk_mq_sched_free_requests blk_mq_free_rqs(q->tag_set, hctx->sched_tags, i) -> step 2) access rq before clearing rq mapping blk_mq_clear_rq_mapping(set, tags, hctx_idx); __free_pages() -> rq is freed here 4) Then, nbd continue to use the freed request in nbd_handle_reply Fix the problem by get 'q_usage_counter' before blk_mq_tag_to_rq(), thus request is ensured not to be freed because 'q_usage_counter' is not zero. Signed-off-by: Yu Kuai --- drivers/block/nbd.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 69dc5eac9ad3..b3a47fc6237f 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -825,6 +825,7 @@ static void recv_work(struct work_struct *work) work); struct nbd_device *nbd = args->nbd; struct nbd_config *config = nbd->config; + struct request_queue *q = nbd->disk->queue; struct nbd_sock *nsock; struct nbd_cmd *cmd; struct request *rq; @@ -835,7 +836,20 @@ static void recv_work(struct work_struct *work) if (nbd_read_reply(nbd, args->index, &reply)) break; + /* + * Grab .q_usage_counter so request pool won't go away, then no + * request use-after-free is possible during nbd_handle_reply(). + * If queue is frozen, there won't be any inflight requests, we + * needn't to handle the incoming garbage message. + */ + if (!percpu_ref_tryget(&q->q_usage_counter)) { + dev_err(disk_to_dev(nbd->disk), "%s: no io inflight\n", + __func__); + break; + } + cmd = nbd_handle_reply(nbd, args->index, &reply); + percpu_ref_put(&q->q_usage_counter); if (IS_ERR(cmd)) break; -- 2.31.1