From patchwork Tue Nov 6 00:44:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 10669513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5DD1714E2 for ; Tue, 6 Nov 2018 00:45:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4529929FE1 for ; Tue, 6 Nov 2018 00:45:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3686B29FE9; Tue, 6 Nov 2018 00:45:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A72329FE1 for ; Tue, 6 Nov 2018 00:45:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726680AbeKFKHy (ORCPT ); Tue, 6 Nov 2018 05:07:54 -0500 Received: from com-out001.mailprotect.be ([83.217.72.83]:35025 "EHLO com-out001.mailprotect.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726274AbeKFKHy (ORCPT ); Tue, 6 Nov 2018 05:07:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mailprotect.be; s=mail; h=Content-Transfer-Encoding:MIME-Version:Message-Id :Date:Subject:Cc:To:From:reply-to:sender:bcc:in-reply-to:references: content-type; bh=upn9cPpqmkxj7TApBTM7aGTpIVZlpXHZnryAX7A9Ro8=; b=NzcoyDWiQO73 yw2fGJ35yzkQHsqxxHJuTIlX6JWmBCETvRqmTxw3I9V71NTAUzjJAEl9aHJvLKLrslO9Z248eun1U +4S0xd8y9biusLBA7lsKvuW1uBotvDhR7kSmt4Zj2CuFZu87eMMNQbdy/ufHG24VHxWDid8LU/PMg 8GWOdEuxNNP8pO7o3R+1UOSGTc521Zul6ubd2hH0Ash46RmE5wPlbh5f90e6aUJCvgDdDvwG+8fGU u3ldMspdGqxlsFNd6sqiKD9r2iFc5bX0uy5UQOPYNpXmwuN73ey4KzfDD55vtc6xHVHiuXYo8MlN2 3TzSNKGN5vmCySGstRcFig==; Received: from smtp-auth.mailprotect.be ([178.208.39.155]) by com-mpt-out001.mailprotect.be with esmtp (Exim 4.89) (envelope-from ) id 1gJpUa-0006Wf-AO; Tue, 06 Nov 2018 01:45:17 +0100 Received: from desktop-bart.svl.corp.google.com (unknown [104.133.8.89]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-auth.mailprotect.be (Postfix) with ESMTPSA id AA2BCC0CA8; Tue, 6 Nov 2018 01:45:05 +0100 (CET) From: Bart Van Assche To: "Martin K . Petersen" Cc: Christoph Hellwig , target-devel@vger.kernel.org, Bart Van Assche , David Disseldorp , Nicholas Bellinger , Mike Christie , Hannes Reinecke Subject: [PATCH v3] target/core: Avoid that a kernel oops is triggered when COMPARE AND WRITE fails Date: Mon, 5 Nov 2018 16:44:59 -0800 Message-Id: <20181106004459.5621-1-bvanassche@acm.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog MIME-Version: 1.0 X-Originating-IP: 178.208.39.155 X-SpamExperts-Domain: mailprotect.be X-SpamExperts-Username: 178.208.39.128/27 Authentication-Results: mailprotect.be; auth=pass smtp.auth=178.208.39.128/27@mailprotect.be X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.02) X-Recommended-Action: accept X-Filter-ID: EX5BVjFpneJeBchSMxfU5v0Ul3qnTzv5CcsKbYZLsSF602E9L7XzfQH6nu9C/Fh9KJzpNe6xgvOx q3u0UDjvO1tLifGj39bI0bcPyaJsYTagCTS5H5Pie2sCQ3gGSzr06cM7U7xDGmYwNG93LVnxwxjk yGQYCd08t3lHobjxX/OigDGQOIiVUN5rGO3B5zfVpnsdsF0/474T9aStD4uEKVG9P9yTThxC66Ku Xb0HO3W8nbMwgkUuW83PKbk25YSnvgtxKKcMIJ7ptgUxRg53TuCt4QJNIvyoxb4710Nl6KAZZ+9r UkyLOOkgJ9eTXvOC4trOptRiSOXsXUvIrRE5GtrOF15HgfuJdg/PIJu9KplI2C8QBYsWIMCVBHpa 7Qj+JYN6Crh9DXUDEtWWsjsNUWDlGPaDR+Aes7asAZpVFyfMODodi5MLJiAvrVIiQFNhc8S+HKYI 1vbaqYoREZsvVKq8YZ9/SG1CqFB/T9oOuGliwtRkR+GX5UQPXdpKZF7ITlSXoP8r3OOc9CaULF46 7VT2rSAdw3oKkBNp3q2CTUjaBEkZvVwfNyBf8N9Cj3+++mTSKn34bbFRlO1kXUycpLT8XjuR2au2 vXjeilQq2Qb31qklcVekvgO5ge3Iu/DWvQSnovmZV/iKI4Qq8lKVZU757KiUYziXyuXG4Z+FT7fy UhTxDKdOQwQquEi4jLe86t14bfTnkAn7W6VlJXtsnkdl1her2dsH1gtu4R2VkYfnELRpqCZGYewS zF6qDSUBpQp9p69drFuEpAhhs7hKCCLwHYF1mz4X0cGLGMLXeUdkzlPUB52ON6ZihnczFUxY2bRk WbJQMsEazexAznFikUFGnvKVJnFQQaAnDicXOB0lxU/TKjOssk5IMwdmSU/MN6mG9OgEfwYjdW8p pBMOL6KehsbCb0/0wF8xekzsVEvRMrw5DdwH1AXXXLvYNFIciWrFfcvTzpdI3AEG059XQUjevnvr gajZuavewM9rwm93OnKG9eRDP2/Ogb+c8D2oYTsY8dUpTw48b2MGkvEkgnYX9jr2DLlotyUbsNEh 0yz2CFl7xGIrJ5fPg33HFhWuygEwwwWe3xXNBQ8NJdm4Pscvb9y1CBweR1aEOEmF+7+XwJhp74Ne BZS/7a9ATcUMpAEntM8yKElR+Y84QVlpY/2Olap60rnP5huMjJeWSwzfzlDTegaelgiu9QvTToG3 X/ekOoQKVaL7/+VCcmuF/Q== X-Report-Abuse-To: spam@com-mpt-mgt001.mailprotect.be Sender: target-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fixes: aa73237dcb2d ("scsi: target/core: Always call transport_complete_callback() upon failure") Reviewed-by: David Disseldorp Cc: Nicholas Bellinger Cc: Mike Christie Cc: Christoph Hellwig Cc: Hannes Reinecke Signed-off-by: Bart Van Assche --- Changes: - v2 -> v3: modified patch title - v1 -> v2: changed approach of this patch as requested by David Disseldorp. drivers/target/target_core_transport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index e31e4fc31aa1..2cfd61d62e97 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -1778,7 +1778,7 @@ EXPORT_SYMBOL(target_submit_tmr); void transport_generic_request_failure(struct se_cmd *cmd, sense_reason_t sense_reason) { - int ret = 0; + int ret = 0, post_ret; pr_debug("-----[ Storage Engine Exception; sense_reason %d\n", sense_reason); @@ -1790,7 +1790,7 @@ void transport_generic_request_failure(struct se_cmd *cmd, transport_complete_task_attr(cmd); if (cmd->transport_complete_callback) - cmd->transport_complete_callback(cmd, false, NULL); + cmd->transport_complete_callback(cmd, false, &post_ret); if (transport_check_aborted_status(cmd, 1)) return;