Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1216332pxb; Thu, 16 Sep 2021 02:25:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6D3MHNerkyh+PUH+8/TJC8UtCwMML75unsTTI9vV2pxQJVmegIUf48nwnyh0OCoUio0NF X-Received: by 2002:a5d:9256:: with SMTP id e22mr3551125iol.152.1631784299817; Thu, 16 Sep 2021 02:24:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631784299; cv=none; d=google.com; s=arc-20160816; b=jw6nWTRsBFKpnE5TDeEC1x+ceHrEmyqbLK6elKfJbCUBoCGd3WMMuDEn47YTrGwuYk ayFILrleEcv5s8y+b3NSbwFeiZUs9/I2QKW8Z+MSz/XPg562gc9A9XtgkqktcumDmjpm LrOkooHD8QZBylo4ZxEeu3w/Yc/3DL/0mfkpywdbfBmVXbM3ql1cxhKWTpbLyEIkoEOH lyQVSxv+41BCzXPZ0Mb2gUKnEUcvc4AtXTKP6Ghq5HUgGs/H3cdc1fx/n6XGkHMwLjHJ obee3GsZODPb9LsHzfMBTpqa8QdKLcnHS3HKzWJITL+VFRqHkWvGzDmcQayQAzcdM757 ccuw== 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 :message-id:date:subject:cc:to:from; bh=3DuAkbyvBiTfFPaJshszO3gwkDVYG699d3CGpURSnzY=; b=k165Z/wriUOE05nbQWahavveZA+JbrunYlnTVIx5pJVNrq9uJxdlu7XzwaA/Vfr6Ae YJo2nLC9PwI+RCo43vNrMa2SFMmHxD5iR5e0yNR1WU7pO1wJIeFzgXKRfy8Dz+ziW2Oi 3hj2Nzby9CYX9803QnS8ZC5zLXwe2lsR3gafsWzrExFe+d8Ii6dQpcmocDaxgP+Z5ArY jUanIeV7ccL1d5PFPmRc2JaLhBzsi13BtYgQiy1cbqKplZ5JrsJmPXhrDoypCj2ch8It oAskE1VzCGuzLMrCvf1tO25HtlzQK1V49omXVmXHb8xRAHWhrSY5f+XUfGQMQLO/OWbN ABWQ== 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 u15si2592176iot.89.2021.09.16.02.24.47; Thu, 16 Sep 2021 02:24: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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235271AbhIPJZX (ORCPT + 99 others); Thu, 16 Sep 2021 05:25:23 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:16264 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235219AbhIPJZX (ORCPT ); Thu, 16 Sep 2021 05:25:23 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4H9BTQ73xtz8t83; Thu, 16 Sep 2021 17:23:22 +0800 (CST) Received: from dggema762-chm.china.huawei.com (10.1.198.204) by dggemv704-chm.china.huawei.com (10.3.19.47) 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:01 +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:00 +0800 From: Yu Kuai To: , , , CC: , , , , Subject: [patch v8 0/7] handle unexpected message from server Date: Thu, 16 Sep 2021 17:33:43 +0800 Message-ID: <20210916093350.1410403-1-yukuai3@huawei.com> X-Mailer: git-send-email 2.31.1 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 This patch set tries to fix that client might oops if nbd server send unexpected message to client, for example, our syzkaller report a uaf in nbd_read_stat(): Call trace: dump_backtrace+0x0/0x310 arch/arm64/kernel/time.c:78 show_stack+0x28/0x38 arch/arm64/kernel/traps.c:158 __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x144/0x1b4 lib/dump_stack.c:118 print_address_description+0x68/0x2d0 mm/kasan/report.c:253 kasan_report_error mm/kasan/report.c:351 [inline] kasan_report+0x134/0x2f0 mm/kasan/report.c:409 check_memory_region_inline mm/kasan/kasan.c:260 [inline] __asan_load4+0x88/0xb0 mm/kasan/kasan.c:699 __read_once_size include/linux/compiler.h:193 [inline] blk_mq_rq_state block/blk-mq.h:106 [inline] blk_mq_request_started+0x24/0x40 block/blk-mq.c:644 nbd_read_stat drivers/block/nbd.c:670 [inline] recv_work+0x1bc/0x890 drivers/block/nbd.c:749 process_one_work+0x3ec/0x9e0 kernel/workqueue.c:2147 worker_thread+0x80/0x9d0 kernel/workqueue.c:2302 kthread+0x1d8/0x1e0 kernel/kthread.c:255 ret_from_fork+0x10/0x18 arch/arm64/kernel/entry.S:1174 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_read_stat 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_read_stat() Changes in v8: - add patch 5 to this series. - modify some words. Changes in v7: - instead of exposing blk_queue_exit(), using percpu_ref_put() directly. - drop the ref right after nbd_handle_reply(). Changes in v6: - don't set cmd->status to error if request is completed before nbd_clear_req(). - get 'q_usage_counter' to prevent accessing freed request through blk_mq_tag_to_rq(), instead of using blk_mq_find_and_get_req(). Changes in v5: - move patch 1 & 2 in v4 (patch 4 & 5 in v5) behind - add some comment in patch 5 Changes in v4: - change the name of the patchset, since uaf is not the only problem if server send unexpected reply message. - instead of adding new interface, use blk_mq_find_and_get_req(). - add patch 5 to this series Changes in v3: - v2 can't fix the problem thoroughly, add patch 3-4 to this series. - modify descriptions. - patch 5 is just a cleanup Changes in v2: - as Bart suggested, add a new helper function for drivers to get request by tag. Yu Kuai (7): nbd: don't handle response without a corresponding request message nbd: make sure request completion won't concurrent nbd: check sock index in nbd_read_stat() nbd: don't start request if nbd_queue_rq() failed nbd: clean up return value checking of sock_xmit() nbd: partition nbd_read_stat() into nbd_read_reply() and nbd_handle_reply() nbd: fix uaf in nbd_handle_reply() drivers/block/nbd.c | 135 +++++++++++++++++++++++++++++++------------- 1 file changed, 96 insertions(+), 39 deletions(-) -- 2.31.1