Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp2227393imm; Thu, 18 Oct 2018 11:01:57 -0700 (PDT) X-Google-Smtp-Source: ACcGV62EqYKN4/ksS6wtM64hV/64f1n/wcWcRm8MHtOcaGlhDJ/ySiFlDw+A8uwim+M2PqKi3UDi X-Received: by 2002:a17:902:d881:: with SMTP id b1-v6mr31549759plz.10.1539885717863; Thu, 18 Oct 2018 11:01:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539885717; cv=none; d=google.com; s=arc-20160816; b=vYSj0XKWBKjkgDYBPnJnNuefs6Y3PK9sbgcUeagl6o91lYu1zZ0x5LF2e8HSSULQRr zCXlOzKjD7pL9txZPtlQv2BXeHPlz90XaOg57A3s7u4GVgtxyrXr5DSYNeCvyfiH16f/ D0ulo3ZBC45Fb7uiliDU/gFqzRM3+bfyLNIZHQ0+olyfAjCVORqEfZZAyxb0quP8YPGj E/2/1gew9SKHmOwAxkJZQRUXp2cKJ4cahOeHyqkQZ5/rW71wnNELRACV6Rq5tz7iuoCy FeI5XwGjkG4TiAsOdHXhtPi3D84vj/RpVgsMkr8HLxfbbTgKsUgPAXMeS9PZuBi75pWo heIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=k2VSXWT1vkfSInYJ8vLfFckIQXZmJpsbi7guCYMSZHU=; b=uojzxZpPkB6iHhT3IOVN8tbhSErj0elkWp6vjcMXvQXQ1byo22ejiOuJzoOiH+YNgN tF5WEqa+cW6pPkFWR/Sl7jX4avwU2BGMs9TmSFwOQiQDmr3f2x/3ySbTQdPgYnaqQt98 TvMCX+riBPJg+eKN4Ah7H1nVM5U3MnQCkdyqGryHHUN973+54dhTCOQURev++8Kcf7LT B5KKXHEP44x+9gFoIhAuwGPorqbOFOKJfqQ3eDa3bY3eNFV++A3gj4ch19b07IiIyXq6 6YaNqh93461T+HMrO6rNx9Km7zDfMK7zDmHqgxzfMKC2qYTz9r5d1md1vHJneZ56adGF w7UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i8f00+ZR; 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 n18-v6si22679675pfb.88.2018.10.18.11.01.42; Thu, 18 Oct 2018 11:01:57 -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; dkim=pass header.i=@kernel.org header.s=default header.b=i8f00+ZR; 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 S1729446AbeJSCCl (ORCPT + 99 others); Thu, 18 Oct 2018 22:02:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:50614 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728822AbeJSCCk (ORCPT ); Thu, 18 Oct 2018 22:02:40 -0400 Received: from localhost (ip-213-127-77-176.ip.prioritytelecom.net [213.127.77.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0CD5D205C9; Thu, 18 Oct 2018 18:00:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1539885635; bh=fZiI0LRMrhZ70Pvo/0lLrGthasdzNL1NZDdvs3kUdhU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i8f00+ZRzyjqV5jL5G4RpTCB847mcifuxWZ0Oj7+Ibuf081EGrxcaZCrs6sjvu6nA +WKypc3mGFnPO7hNgAvqgaLoUwUQfI5Up4R1QCrO7s4JrtMyNMNrhDHK1NMhp9IH6y 2Ip3YSJkjXDkCofk9UCyWg9e9ktIb1PizEjn1Nzg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Thumshirn , Hannes Reinecke , Bart Van Assche , Christoph Hellwig , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.14 23/41] scsi: sd: dont crash the host on invalid commands Date: Thu, 18 Oct 2018 19:54:38 +0200 Message-Id: <20181018175420.805611901@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181018175416.718399607@linuxfoundation.org> References: <20181018175416.718399607@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johannes Thumshirn [ Upstream commit f1f1fadacaf08b7cf11714c0c29f8fa4d4ef68a9 ] When sd_init_command() get's a command 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 Reviewed-by: Bart Van Assche Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/sd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1285,7 +1285,8 @@ static int sd_init_command(struct scsi_c case REQ_OP_ZONE_RESET: return sd_zbc_setup_reset_cmnd(cmd); default: - BUG(); + WARN_ON_ONCE(1); + return BLKPREP_KILL; } }