From patchwork Mon Nov 11 18:29:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 11237433 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3613617E6 for ; Mon, 11 Nov 2019 18:29:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1DFC42173B for ; Mon, 11 Nov 2019 18:29:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726943AbfKKS3w (ORCPT ); Mon, 11 Nov 2019 13:29:52 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:43400 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726896AbfKKS3w (ORCPT ); Mon, 11 Nov 2019 13:29:52 -0500 Received: by mail-pl1-f193.google.com with SMTP id a18so8114846plm.10 for ; Mon, 11 Nov 2019 10:29:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FafHSQTeB+oL+1Ea8E3h3fP45BInkUwYj+XvGmzJ0Lc=; b=R58z7FPSsCDI0qtQcmbZT1dgxtWzW8Sts7Ebp8/w6QltfnNbWfk/vEpKjesBd8UaWY 9S/anhwr+TPXXTKoUvAYkabr9F5CoCJ8bYo20gyGoFafXhE3e4qfH5YfsluSEf6c4/tF p9hPL/ghU0dxM7kBpXZ0oZqmpd8SOObyQBNJrLRAZwtpsyI/SBXkaU4TcOmcunOzu+Ho 1CfBu2tAJSJa46rEvCerZhnGxdc40Y9Z7ufh2TbZA2ryHSuKcRyPxNKNJCARrttRcGQH 5CIPG66Fg7KHBIMQbU0zDNpJNzyKloDJL+Qx9udrxSdRqZZR0kATsCJRoTDagZ8aQTeX u5pg== X-Gm-Message-State: APjAAAWr4/9JsHF9Va598YFj4gySGcOaEjlKd5gartd9s6UrP28XSY0D zZWEC0++cC1gsKPPBlK5qv0= X-Google-Smtp-Source: APXvYqxiLfcgKDwgRDGx7LjJwCqRWxoou1PpELdlm5cV/Nm/jwN221fqQvTf6ZnIUs4+MV/zNJY6EA== X-Received: by 2002:a17:902:102:: with SMTP id 2mr27662133plb.156.1573496991924; Mon, 11 Nov 2019 10:29:51 -0800 (PST) Received: from desktop-bart.svl.corp.google.com ([2620:15c:2cd:202:4308:52a3:24b6:2c60]) by smtp.gmail.com with ESMTPSA id z62sm20635925pfz.135.2019.11.11.10.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 10:29:51 -0800 (PST) From: Bart Van Assche To: "Martin K . Petersen" Cc: Mike Christie , Christoph Hellwig , target-devel@vger.kernel.org, Bart Van Assche Subject: [PATCH 1/2] target/core: Declare target_release_reservation() 'static' Date: Mon, 11 Nov 2019 10:29:43 -0800 Message-Id: <20191111182944.191123-2-bvanassche@acm.org> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog In-Reply-To: <20191111182944.191123-1-bvanassche@acm.org> References: <20191111182944.191123-1-bvanassche@acm.org> MIME-Version: 1.0 Sender: target-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org Since this function is only used inside the source file in which it has been defined, declare it 'static'. See also commit fae43461f8f2 ("scsi: target/core: Rework the SPC-2 reservation handling code"). Cc: Mike Christie Signed-off-by: Bart Van Assche Reviewed-by: Roman Bolshakov --- drivers/target/target_core_pr.c | 2 +- drivers/target/target_core_pr.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c index 5e931690e697..6a72b61e0076 100644 --- a/drivers/target/target_core_pr.c +++ b/drivers/target/target_core_pr.c @@ -187,7 +187,7 @@ static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd) return 0; } -void target_release_reservation(struct se_device *dev) +static void target_release_reservation(struct se_device *dev) { dev->reservation_holder = NULL; dev->dev_reservation_flags &= ~DRF_SPC2_RESERVATIONS; diff --git a/drivers/target/target_core_pr.h b/drivers/target/target_core_pr.h index a31c93e4e19c..198fad5c89dc 100644 --- a/drivers/target/target_core_pr.h +++ b/drivers/target/target_core_pr.h @@ -58,7 +58,6 @@ extern struct kmem_cache *t10_pr_reg_cache; extern void core_pr_dump_initiator_port(struct t10_pr_registration *, char *, u32); -extern void target_release_reservation(struct se_device *dev); extern sense_reason_t target_scsi2_reservation_release(struct se_cmd *); extern sense_reason_t target_scsi2_reservation_reserve(struct se_cmd *); extern int core_scsi3_alloc_aptpl_registration( From patchwork Mon Nov 11 18:29:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 11237463 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2625214ED for ; Mon, 11 Nov 2019 19:11:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0563A20659 for ; Mon, 11 Nov 2019 19:11:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727059AbfKKS34 (ORCPT ); Mon, 11 Nov 2019 13:29:56 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:42139 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726896AbfKKS3z (ORCPT ); Mon, 11 Nov 2019 13:29:55 -0500 Received: by mail-pl1-f196.google.com with SMTP id j12so8103553plt.9 for ; Mon, 11 Nov 2019 10:29:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8uO17rM70VvFmZWfOSQ7X9zYCjdulEcWbWB/wbqG4K4=; b=nWNrbuakGDxbovP8d/3P/C//JtW1vEgpYxT8ngAvFL9atGHk4p8v3E83OVpWWquuCi GU/WJKkq3GLEe0+wmdxnDYcEhKi1hF2hWchYAycYz4FXJrIK9ZYsqL2uZkF/FBHVFCE2 tpmRNPsI9lEyCSQnkYpd/d/HX8crlqVP/7a4wYL7km6w9Mx7I23gL4O2WAOU1Vv415K0 YouszlbKApdog0ODZtT9NXVdRkdYmZX2qvI/eosQ5NhsDqBeMEljAZVywNeoqVfpEzI8 0L9pgy7DT/1Mq+6eJqadcGijJLsNXes40kqRhBUu8/LKAaVKjQ1qDyG6Xztq2JlpJHz9 tGNQ== X-Gm-Message-State: APjAAAU+rfTUvf4XwcAOoncjRTFLYgITg8iSmLh++RrehADI4Zpql65v xgs4PC/QiPcG8Nm7xrCAF0E= X-Google-Smtp-Source: APXvYqy9qtNRIISqxxsMeq+VGVHqdf0wi+N2QUFDGc9Cj0UPBhWblmPn6Qn9nHSDGV5OxPqAZh/b9g== X-Received: by 2002:a17:902:aa86:: with SMTP id d6mr27975812plr.268.1573496993319; Mon, 11 Nov 2019 10:29:53 -0800 (PST) Received: from desktop-bart.svl.corp.google.com ([2620:15c:2cd:202:4308:52a3:24b6:2c60]) by smtp.gmail.com with ESMTPSA id z62sm20635925pfz.135.2019.11.11.10.29.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 10:29:52 -0800 (PST) From: Bart Van Assche To: "Martin K . Petersen" Cc: Mike Christie , Christoph Hellwig , target-devel@vger.kernel.org, Bart Van Assche Subject: [PATCH 2/2] target/iscsi: Fix a use-after-free while closing a session Date: Mon, 11 Nov 2019 10:29:44 -0800 Message-Id: <20191111182944.191123-3-bvanassche@acm.org> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog In-Reply-To: <20191111182944.191123-1-bvanassche@acm.org> References: <20191111182944.191123-1-bvanassche@acm.org> MIME-Version: 1.0 Sender: target-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org This patch fixes the following use-after-free in the code that supports SPC-2 reservations: BUG: KASAN: use-after-free in target_check_reservation+0x171/0x980 [target_core_mod] Read of size 8 at addr ffff88802ecd1878 by task iscsi_trx/17200 CPU: 0 PID: 17200 Comm: iscsi_trx Not tainted 5.4.0-rc1-dbg+ #1 Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 Call Trace: dump_stack+0x8a/0xd6 print_address_description.constprop.0+0x40/0x60 __kasan_report.cold+0x1b/0x34 kasan_report+0x16/0x20 __asan_load8+0x58/0x90 target_check_reservation+0x171/0x980 [target_core_mod] __target_execute_cmd+0xb1/0xf0 [target_core_mod] target_execute_cmd+0x22d/0x4d0 [target_core_mod] transport_generic_new_cmd+0x31f/0x5b0 [target_core_mod] transport_handle_cdb_direct+0x6f/0x90 [target_core_mod] iscsit_execute_cmd+0x381/0x3f0 [iscsi_target_mod] iscsit_sequence_cmd+0x13b/0x1f0 [iscsi_target_mod] iscsit_process_scsi_cmd+0x4c/0x130 [iscsi_target_mod] iscsit_get_rx_pdu+0x8e8/0x15f0 [iscsi_target_mod] iscsi_target_rx_thread+0x105/0x1b0 [iscsi_target_mod] kthread+0x1bc/0x210 ret_from_fork+0x24/0x30 Allocated by task 1079: save_stack+0x23/0x90 __kasan_kmalloc.constprop.0+0xcf/0xe0 kasan_slab_alloc+0x12/0x20 kmem_cache_alloc+0xfe/0x3a0 transport_alloc_session+0x29/0x80 [target_core_mod] iscsi_target_login_thread+0xceb/0x1920 [iscsi_target_mod] kthread+0x1bc/0x210 ret_from_fork+0x24/0x30 Freed by task 17193: save_stack+0x23/0x90 __kasan_slab_free+0x13a/0x190 kasan_slab_free+0x12/0x20 kmem_cache_free+0xc8/0x3e0 transport_free_session+0x179/0x2f0 [target_core_mod] transport_deregister_session+0x121/0x170 [target_core_mod] iscsit_close_session+0x12c/0x350 [iscsi_target_mod] iscsit_logout_post_handler+0x136/0x380 [iscsi_target_mod] iscsit_response_queue+0x8fa/0xc00 [iscsi_target_mod] iscsi_target_tx_thread+0x28e/0x390 [iscsi_target_mod] kthread+0x1bc/0x210 ret_from_fork+0x24/0x30 The buggy address belongs to the object at ffff88802ecd1860 which belongs to the cache se_sess_cache of size 352 The buggy address is located 24 bytes inside of 352-byte region [ffff88802ecd1860, ffff88802ecd19c0) The buggy address belongs to the page: page:ffffea0000bb3400 refcount:1 mapcount:0 mapping:ffff8880bef2ed00 index:0x0 compound_mapcount: 0 flags: 0x1000000000010200(slab|head) raw: 1000000000010200 dead000000000100 dead000000000122 ffff8880bef2ed00 raw: 0000000000000000 0000000080270027 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff88802ecd1700: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff88802ecd1780: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb >ffff88802ecd1800: fb fb fb fb fc fc fc fc fc fc fc fc fb fb fb fb ^ ffff88802ecd1880: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff88802ecd1900: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb Cc: Mike Christie Signed-off-by: Bart Van Assche --- drivers/target/target_core_transport.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index ba7a01bcad7c..12bc8545f91b 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -584,6 +584,15 @@ void transport_free_session(struct se_session *se_sess) } EXPORT_SYMBOL(transport_free_session); +static int target_release_res(struct se_device *dev, void *data) +{ + struct se_session *sess = data; + + if (dev->reservation_holder == sess) + dev->reservation_holder = NULL; + return 0; +} + void transport_deregister_session(struct se_session *se_sess) { struct se_portal_group *se_tpg = se_sess->se_tpg; @@ -600,6 +609,8 @@ void transport_deregister_session(struct se_session *se_sess) se_sess->fabric_sess_ptr = NULL; spin_unlock_irqrestore(&se_tpg->session_lock, flags); + target_for_each_device(target_release_res, se_sess); + pr_debug("TARGET_CORE[%s]: Deregistered fabric_sess\n", se_tpg->se_tpg_tfo->fabric_name); /*