Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp301810imm; Fri, 21 Sep 2018 00:01:58 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYW6tN2V/V9yNtAdb3MRVCa2JQKNc9/Nx6/64WdvfwN7IK7sYe2Aw3CV2yYK7fd4nkL7r7y X-Received: by 2002:a17:902:710c:: with SMTP id a12-v6mr43517093pll.310.1537513318840; Fri, 21 Sep 2018 00:01:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537513318; cv=none; d=google.com; s=arc-20160816; b=zbjFTwYCn1kMdLt22o92jDLSXmYgeM47pX51Naz4ElkdqKZKHghigLNOFgkJMyVZDQ ZaZT27De6O3g1MkPvUYmtX+ZjVMBOKRe9z+gOnw/MSU3QzYQDvhFxOAMCqjA8fNno/fQ hFzx2aOGks/Z2mKaK/GdKaay6BubU6m1KQ7ifWi1Fgu+T1RfPmFf5/eWseIGOd7QDteg Mt++ynAJPY3LhAsvMyJ3NFS9OoAFWy4dISRYSgpUiBbd1Ek8766VsdjO2mLpO53CSXGN AAcH5o8XcFy7rC1t2MjbXx3w6t4iG/ofx5rQQBJ2FKpo1NXowOGF+M+c/h3AZDHjxZ5C cB+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=7MKb/PQuXyMLKjAb0dGvQ59sHr3x4lppKExA9jvpt48=; b=XyXYDZs4VLc0wxyKdjr4b9vLb7C1TkEifjfgT2mU3jxna2cw5dNXoPuNslLra7ScPi P6WlTYUzdd3rM5y+ft8QcPk0qCedAlj7HNYHOQaTlekhzfh9YFCOUMLmTpUTt8q730qF 8kzluNI8pGjd9Whb847jJwyLK5Qpd+L8WfPBojFIYr31SS3SQWOvlkjtb8uJ5USNNteD cncstBWXMSzBT83L7+ktyQr2z8+Ek6vCYDiBUbB0sl0L+rw9C77pobswC/pWSUfhkyG+ TgxSBL6nxhbGm/0DEO9UaLgjKZbc4xUgrGVbixd9jWBgFdqQaaVn1zbj4fMo0+sF+407 neug== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h69-v6si26867389pfc.121.2018.09.21.00.01.43; Fri, 21 Sep 2018 00:01:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389356AbeIUMsf (ORCPT + 99 others); Fri, 21 Sep 2018 08:48:35 -0400 Received: from mx2.suse.de ([195.135.220.15]:49386 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388909AbeIUMsf (ORCPT ); Fri, 21 Sep 2018 08:48:35 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 608B3AD65; Fri, 21 Sep 2018 07:01:04 +0000 (UTC) From: Johannes Thumshirn To: "Martin K . Petersen" Cc: Linux Kernel Mailinglist , Linux SCSI Mailinglist , Johannes Thumshirn , Hannes Reinecke , Bart Van Assche , Christoph Hellwig Subject: [PATCH v2] scsi: sd: don't crash the host on invalid commands Date: Fri, 21 Sep 2018 09:01:01 +0200 Message-Id: <20180921070101.9260-1-jthumshirn@suse.de> X-Mailer: git-send-email 2.16.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When sd_init_command() get's a with a unknown req_op() it crashes the system via BUG(). This makes debugging the actual reason for the broken request cmd_flags pretty hard as the system is down before it's able to write out debugging data on the serial console or the trace buffer. Change the BUG() to a WARN_ON() and return BLKPREP_KILL to fail gracefully and return an I/O error to the producer of the request. Signed-off-by: Johannes Thumshirn Cc: Hannes Reinecke Cc: Bart Van Assche Cc: Christoph Hellwig Reviewed-by: Christoph Hellwig --- Changes since v1: - Use WARN_ON_ONCE() (Bart) --- drivers/scsi/sd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index b79b366a94f7..f2e41f04e40b 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1276,7 +1276,8 @@ static int sd_init_command(struct scsi_cmnd *cmd) case REQ_OP_ZONE_RESET: return sd_zbc_setup_reset_cmnd(cmd); default: - BUG(); + WARN_ON_ONCE(1); + return BLKPREP_KILL; } } -- 2.16.4