From patchwork Tue Nov 12 03:57:50 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: 11238525 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 C4316139A for ; Tue, 12 Nov 2019 03:58:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD0F72084E for ; Tue, 12 Nov 2019 03:58:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726939AbfKLD6F (ORCPT ); Mon, 11 Nov 2019 22:58:05 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:39371 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726910AbfKLD6F (ORCPT ); Mon, 11 Nov 2019 22:58:05 -0500 Received: by mail-pg1-f195.google.com with SMTP id 29so10928134pgm.6 for ; Mon, 11 Nov 2019 19:58:02 -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=O5hgdp2lFIg4CqxbA59bUR69tQdjiIQGuAMAXwbl+WA=; b=luaEeFRJsz+4ARFGCrLl+EnV5OYEvnV4QAjXoQLNlt6xcCK2baluQtagQXqJISefCz r0kKuu8YNflrN6XO91JVyZm0UyXFrmKCAQbmd04uQLTXjtb791grCplRRalfuSbd9hkZ dMq0coi4+7NBxyi1R8200A5vXHBt9bT7rZX+vFCvoEgsDfZoeg0I/1s+yW2MkVozZBkg o9VqoGTkbV74X75URIn2J9Thuzta+dUwq/4nDhRCs3lCqbePh3wj7XDXXwoF81nU4Sve KEKUlQTNQe47/7hUEgY+UbgSWt/4kpbpFOZ9yc0PARFQteIj9p9n7iZwE0IC/2yJuoi5 4RpQ== X-Gm-Message-State: APjAAAWHdHTlnHRcOMjD4YgcMh+HJd23Xrefpjz2PgRTwJJoivqOGi/E iGmdy6jOsDG9ycYWtuyBq+m5Y2FW X-Google-Smtp-Source: APXvYqwdLZTBqKSWIfV70OQoedlDOlADa4viuus4oMNFxW/Ste5tqN2JFzA3cIN/X1TH6BaHjxPs8Q== X-Received: by 2002:a62:8243:: with SMTP id w64mr26043805pfd.0.1573531081961; Mon, 11 Nov 2019 19:58:01 -0800 (PST) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:a8:97:b734:6b8f:663c]) by smtp.gmail.com with ESMTPSA id e5sm784288pjv.29.2019.11.11.19.58.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 19:58:01 -0800 (PST) From: Bart Van Assche To: "Martin K . Petersen" Cc: Mike Christie , Roman Bolshakov , Christoph Hellwig , target-devel@vger.kernel.org, Bart Van Assche Subject: [PATCH 1/3] target/core: Release SPC-2 reservations when closing a session Date: Mon, 11 Nov 2019 19:57:50 -0800 Message-Id: <20191112035752.8338-2-bvanassche@acm.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191112035752.8338-1-bvanassche@acm.org> References: <20191112035752.8338-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 Release reservations when closing a session as required by SPC-2. Running the libiscsi tests triggers the KASAN complaint shown below. This patch fixes that use-after-free. 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 Cc: Roman Bolshakov Signed-off-by: Bart Van Assche Reviewed-by: Roman Bolshakov --- drivers/target/target_core_transport.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index ba7a01bcad7c..09f833c1de8a 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) + target_release_reservation(dev); + return 0; +} + void transport_deregister_session(struct se_session *se_sess) { struct se_portal_group *se_tpg = se_sess->se_tpg; @@ -600,6 +609,12 @@ void transport_deregister_session(struct se_session *se_sess) se_sess->fabric_sess_ptr = NULL; spin_unlock_irqrestore(&se_tpg->session_lock, flags); + /* + * Since the session is being removed, release SPC-2 + * reservations held by the session that is disappearing. + */ + 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); /* From patchwork Tue Nov 12 03:57:51 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: 11238523 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 8157E159A for ; Tue, 12 Nov 2019 03:58:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A06B2084E for ; Tue, 12 Nov 2019 03:58:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726927AbfKLD6E (ORCPT ); Mon, 11 Nov 2019 22:58:04 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:45385 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726910AbfKLD6E (ORCPT ); Mon, 11 Nov 2019 22:58:04 -0500 Received: by mail-pf1-f194.google.com with SMTP id z4so12320380pfn.12 for ; Mon, 11 Nov 2019 19:58:03 -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=qQsBDiPkxtL928atho+ukThThK4lob1as5aFbJEM/XA=; b=Pa+DVt5YXnUjimnhbBcjc4U8Xx41fy7xrsbaRHihjoNzi1N7HKxhfxtHdvlLl5dfOv aO9eGfR7IKDofyJi8r0It9ys5MaeJILshXftxDQ74ocueN9F9t5ow5SkS5JZQttEcjTw PGVmYEbWUXvmELUDA8MVWw0gMIods0vSZ6FKHbN9sG4OKVmx4oMTndMkI1mv/xs2eHR5 +m3a4ZIJfYfPWssTPpFZcd/MFhVm8VoTZcl9DL9rmZQJPPoW2vJs5jv6L1IUqFvGaEO0 l2Ss4mBqHNW0EsFLoMvz8FWO5vAqWERmySGDWtUR7b0+iNmiA45MIqvep1W198pJ7hnc jqqQ== X-Gm-Message-State: APjAAAXufmdEVwnyhbyAjqRcEBaRauYYunZaX6QZwTQduyXnVEHDG+qu 1f3fipOBrLEBYf5uU+DoCcI= X-Google-Smtp-Source: APXvYqzKPBtgMo4mMTX5F2AHF8WWZ5fM25oSFGQ+tM9ADGxKsqYH/IkBv9OuDeowWzL/iWRJnWZo7Q== X-Received: by 2002:a17:90b:30ca:: with SMTP id hi10mr3481014pjb.143.1573531083264; Mon, 11 Nov 2019 19:58:03 -0800 (PST) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:a8:97:b734:6b8f:663c]) by smtp.gmail.com with ESMTPSA id e5sm784288pjv.29.2019.11.11.19.58.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 19:58:02 -0800 (PST) From: Bart Van Assche To: "Martin K . Petersen" Cc: Mike Christie , Roman Bolshakov , Christoph Hellwig , target-devel@vger.kernel.org, Bart Van Assche Subject: [PATCH 2/3] target/core: Fix a use-after-free in the TMF handling code Date: Mon, 11 Nov 2019 19:57:51 -0800 Message-Id: <20191112035752.8338-3-bvanassche@acm.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191112035752.8338-1-bvanassche@acm.org> References: <20191112035752.8338-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 The target_remove_from_state_list() call uses the cmd->dev pointer. Make sure that that pointer remains valid as long as TMF processing is in progress. This patch fixes the following KASAN complaint: BUG: KASAN: use-after-free in target_remove_from_state_list+0x22/0x130 [target_core_mod] Read of size 8 at addr ffff8880b110cf80 by task kworker/0:1/12 CPU: 0 PID: 12 Comm: kworker/0:1 Not tainted 5.4.0-rc1-dbg+ #6 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014 Workqueue: events target_tmr_work [target_core_mod] Call Trace: dump_stack+0x8a/0xd6 print_address_description.constprop.0+0x40/0x60 __kasan_report.cold+0x1b/0x33 kasan_report+0x16/0x20 __asan_load8+0x58/0x90 target_remove_from_state_list+0x22/0x130 [target_core_mod] transport_cmd_check_stop_to_fabric+0x17/0xe0 [target_core_mod] target_tmr_work+0xe2/0x1a0 [target_core_mod] process_one_work+0x549/0xa40 worker_thread+0x7a/0x5d0 kthread+0x1bc/0x210 ret_from_fork+0x24/0x30 The buggy address belongs to the page: page:ffffea0002c44300 refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 flags: 0x1fff000000000000() raw: 1fff000000000000 0000000000000000 ffffea0002c44308 0000000000000000 raw: 0000000000000000 0000000000000000 00000000ffffffff 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff8880b110ce80: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ffff8880b110cf00: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff >ffff8880b110cf80: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ^ ffff8880b110d000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ffff8880b110d080: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff Cc: Mike Christie Cc: Roman Bolshakov Signed-off-by: Bart Van Assche --- drivers/target/target_core_transport.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 09f833c1de8a..ba6bd73fe63b 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -3256,6 +3256,8 @@ static void target_tmr_work(struct work_struct *work) struct se_tmr_req *tmr = cmd->se_tmr_req; int ret; + target_depend_item(&dev->dev_group.cg_item); + if (cmd->transport_state & CMD_T_ABORTED) goto aborted; @@ -3297,10 +3299,14 @@ static void target_tmr_work(struct work_struct *work) cmd->se_tfo->queue_tm_rsp(cmd); transport_cmd_check_stop_to_fabric(cmd); + +out: + target_undepend_item(&dev->dev_group.cg_item); return; aborted: target_handle_abort(cmd); + goto out; } int transport_generic_handle_tmr( From patchwork Tue Nov 12 03:57:52 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: 11238527 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 1F2811747 for ; Tue, 12 Nov 2019 03:58:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 080DB2084E for ; Tue, 12 Nov 2019 03:58:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726910AbfKLD6F (ORCPT ); Mon, 11 Nov 2019 22:58:05 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:39714 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726932AbfKLD6F (ORCPT ); Mon, 11 Nov 2019 22:58:05 -0500 Received: by mail-pl1-f194.google.com with SMTP id o9so8786154plk.6 for ; Mon, 11 Nov 2019 19:58:04 -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=gBdM1IOsTx9ugYHA9hZGEiS0pYwYy3OZctD5IyWdXmo=; b=WlCWfDuKhxS3jm8nxnZH539vCwXvd+r+RKk4KBRcmbcO+qU3/SL7JTswQicWAQlOVt mRfdZK51mDx89QiT/y93DemdgG7nDNJ0yG/v244+RRVrpW1dNZMzEEgflTB/XkdtfKPr Ta1w2MplTOKOjOXWj8fRFwgKTzcQ8+ISYG12k3ILXLqBt4Oiqq+8lCmGlEWtVIyfYwHH 2H6XB0EgHwfOfH/+CUwxAEZGTuDEOZohLUpAi+7dsPWjkj1qFUHbwNG5Ob0VfiVSdzxj qFdziag1Xu6e2K8MVVR5yldjxcYVWHYciz8u55ggFHczVO5xJtQQdPX/LkOrOuulGO0q mCzA== X-Gm-Message-State: APjAAAW1s6XGP6POF7DG8cPd+L9jJYs2OIE4Me2mvBhzkPQ99M3eK924 6ezED3eFOHRi1N9qUedInsmXJZ+U X-Google-Smtp-Source: APXvYqxiqO4YOEUknctqOzvfzYxJd4BCwbYuieyREYJW7Jzv2z7OvuUOXSzBcyjr8ZKOmZF5A25COw== X-Received: by 2002:a17:902:8a8d:: with SMTP id p13mr28872583plo.178.1573531084429; Mon, 11 Nov 2019 19:58:04 -0800 (PST) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:a8:97:b734:6b8f:663c]) by smtp.gmail.com with ESMTPSA id e5sm784288pjv.29.2019.11.11.19.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 19:58:03 -0800 (PST) From: Bart Van Assche To: "Martin K . Petersen" Cc: Mike Christie , Roman Bolshakov , Christoph Hellwig , target-devel@vger.kernel.org, Bart Van Assche Subject: [PATCH 3/3] target/iscsi: Wait for all commands to finish before freeing a session Date: Mon, 11 Nov 2019 19:57:52 -0800 Message-Id: <20191112035752.8338-4-bvanassche@acm.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191112035752.8338-1-bvanassche@acm.org> References: <20191112035752.8338-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 KASAN complaint: BUG: KASAN: use-after-free in __lock_acquire+0xb1a/0x2710 Read of size 8 at addr ffff8881154eca70 by task kworker/0:2/247 CPU: 0 PID: 247 Comm: kworker/0:2 Not tainted 5.4.0-rc1-dbg+ #6 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014 Workqueue: target_completion target_complete_ok_work [target_core_mod] Call Trace: dump_stack+0x8a/0xd6 print_address_description.constprop.0+0x40/0x60 __kasan_report.cold+0x1b/0x33 kasan_report+0x16/0x20 __asan_load8+0x58/0x90 __lock_acquire+0xb1a/0x2710 lock_acquire+0xd3/0x200 _raw_spin_lock_irqsave+0x43/0x60 target_release_cmd_kref+0x162/0x7f0 [target_core_mod] target_put_sess_cmd+0x2e/0x40 [target_core_mod] lio_check_stop_free+0x12/0x20 [iscsi_target_mod] transport_cmd_check_stop_to_fabric+0xd8/0xe0 [target_core_mod] target_complete_ok_work+0x1b0/0x790 [target_core_mod] process_one_work+0x549/0xa40 worker_thread+0x7a/0x5d0 kthread+0x1bc/0x210 ret_from_fork+0x24/0x30 Allocated by task 889: save_stack+0x23/0x90 __kasan_kmalloc.constprop.0+0xcf/0xe0 kasan_slab_alloc+0x12/0x20 kmem_cache_alloc+0xf6/0x360 transport_alloc_session+0x29/0x80 [target_core_mod] iscsi_target_login_thread+0xcd6/0x18f0 [iscsi_target_mod] kthread+0x1bc/0x210 ret_from_fork+0x24/0x30 Freed by task 1025: save_stack+0x23/0x90 __kasan_slab_free+0x13a/0x190 kasan_slab_free+0x12/0x20 kmem_cache_free+0x146/0x400 transport_free_session+0x179/0x2f0 [target_core_mod] transport_deregister_session+0x130/0x180 [target_core_mod] iscsit_close_session+0x12c/0x350 [iscsi_target_mod] iscsit_logout_post_handler+0x136/0x380 [iscsi_target_mod] iscsit_response_queue+0x8de/0xbe0 [iscsi_target_mod] iscsi_target_tx_thread+0x27f/0x370 [iscsi_target_mod] kthread+0x1bc/0x210 ret_from_fork+0x24/0x30 The buggy address belongs to the object at ffff8881154ec9c0 which belongs to the cache se_sess_cache of size 352 The buggy address is located 176 bytes inside of 352-byte region [ffff8881154ec9c0, ffff8881154ecb20) The buggy address belongs to the page: page:ffffea0004553b00 refcount:1 mapcount:0 mapping:ffff888101755400 index:0x0 compound_mapcount: 0 flags: 0x2fff000000010200(slab|head) raw: 2fff000000010200 dead000000000100 dead000000000122 ffff888101755400 raw: 0000000000000000 0000000080130013 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff8881154ec900: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ffff8881154ec980: fc fc fc fc fc fc fc fc fb fb fb fb fb fb fb fb >ffff8881154eca00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff8881154eca80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff8881154ecb00: fb fb fb fb fc fc fc fc fc fc fc fc fc fc fc fc Cc: Mike Christie Cc: Roman Bolshakov Signed-off-by: Bart Van Assche --- drivers/target/iscsi/iscsi_target.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 09e55ea0bf5d..2486fc5a92c5 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -1165,7 +1165,9 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, hdr->cmdsn, be32_to_cpu(hdr->data_length), payload_length, conn->cid); - target_get_sess_cmd(&cmd->se_cmd, true); + if (target_get_sess_cmd(&cmd->se_cmd, true) < 0) + return iscsit_add_reject_cmd(cmd, + ISCSI_REASON_BOOKMARK_NO_RESOURCES, buf); cmd->sense_reason = transport_lookup_cmd_lun(&cmd->se_cmd, scsilun_to_int(&hdr->lun)); @@ -2002,7 +2004,9 @@ iscsit_handle_task_mgt_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, conn->sess->se_sess, 0, DMA_NONE, TCM_SIMPLE_TAG, cmd->sense_buffer + 2); - target_get_sess_cmd(&cmd->se_cmd, true); + if (target_get_sess_cmd(&cmd->se_cmd, true) < 0) + return iscsit_add_reject_cmd(cmd, + ISCSI_REASON_BOOKMARK_NO_RESOURCES, buf); /* * TASK_REASSIGN for ERL=2 / connection stays inside of @@ -4230,6 +4234,8 @@ int iscsit_close_connection( * must wait until they have completed. */ iscsit_check_conn_usage_count(conn); + target_sess_cmd_list_set_waiting(sess->se_sess); + target_wait_for_sess_cmds(sess->se_sess); ahash_request_free(conn->conn_tx_hash); if (conn->conn_rx_hash) {