From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8734CC432C3 for ; Fri, 22 Nov 2019 11:21:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 566382084D for ; Fri, 22 Nov 2019 11:21:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574421692; bh=42CYjEfByef5fyj2v+6dXNq1j0eelE7rbuPTQ5RZEIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=F9BHtYe2FNqKjtryaA4hiVnRa1wBXsR04KzsN4W9KuUbnryyk0ZaroEl6SlA4mUFV nqpEEbRi9eWbCryz4H/PycakQGvjDmoikkFRJGxegxK7wVgvKl7yhA+EfLCJ4jRtCS cT16TI6rJ/lDkJ/2YEIirve5Qhe3Idf5VZwF3JF4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728933AbfKVKpL (ORCPT ); Fri, 22 Nov 2019 05:45:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:51420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727978AbfKVKpL (ORCPT ); Fri, 22 Nov 2019 05:45:11 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 543902071F; Fri, 22 Nov 2019 10:45:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419510; bh=42CYjEfByef5fyj2v+6dXNq1j0eelE7rbuPTQ5RZEIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ks+c4buVXK7FSuOuIJP4/a6H8lAwZCLczE30LohX+7XS837j2SKlJQ1xPnVlaKWC0 NRM6CBpZ6yK9RRuz0BcAJuJyZWzm1kkJnQGxshaPISCKbDZWZP+RQgxjTq8ZV8dfnM +ZYOTMyofuc8ixW9TKbDeSn8wCChjUXSfCeqaUaY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Schmitz , Finn Thain , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.9 136/222] scsi: NCR5380: Check for invalid reselection target Date: Fri, 22 Nov 2019 11:27:56 +0100 Message-Id: <20191122100912.727899334@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Finn Thain [ Upstream commit 7ef55f6744c45e3d7c85a3f74ada39b67ac741dd ] The X3T9.2 specification (draft) says, under "6.1.4.1 RESELECTION", that "the initiator shall not respond to a RESELECTION phase if other than two SCSI ID bits are on the DATA BUS." This issue (too many bits set) has been observed in the wild, so add a check. Tested-by: Michael Schmitz Signed-off-by: Finn Thain Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/NCR5380.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 35419ba32c467..15c0fff7519be 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -2102,6 +2102,11 @@ static void NCR5380_reselect(struct Scsi_Host *instance) NCR5380_write(MODE_REG, MR_BASE); target_mask = NCR5380_read(CURRENT_SCSI_DATA_REG) & ~(hostdata->id_mask); + if (!target_mask || target_mask & (target_mask - 1)) { + shost_printk(KERN_WARNING, instance, + "reselect: bad target_mask 0x%02x\n", target_mask); + return; + } dsprintk(NDEBUG_RESELECTION, instance, "reselect\n"); -- 2.20.1